Skip to content

Add null checks to ColladaMeshShape.java #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 9, 2019
Merged

Add null checks to ColladaMeshShape.java #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/gov/nasa/worldwind/ogc/collada/impl/ColladaMeshShape.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,6 +1192,9 @@ protected String getTexCoordSemantic(Geometry geometry)
*/
protected String getTextureSource(ColladaAbstractGeometry geometry)
{
if (this.bindMaterial == null)
return null;

ColladaTechniqueCommon techniqueCommon = this.bindMaterial.getTechniqueCommon();
if (techniqueCommon == null)
return null;
Expand Down Expand Up @@ -1297,7 +1300,10 @@ protected String getImageRef(ColladaEffect effect, ColladaTexture texture)
* available.
*/
protected ColladaEffect getEffect(ColladaAbstractGeometry geometry)
{
{
if (this.bindMaterial == null)
return null;

ColladaTechniqueCommon techniqueCommon = this.bindMaterial.getTechniqueCommon();
if (techniqueCommon == null)
return null;
Expand Down