summaryrefslogtreecommitdiff
path: root/trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator
diff options
context:
space:
mode:
authorkintel <kintel@cb376a5e-1013-0410-a455-b6b1f9ac8223>2009-05-03 20:40:11 +0000
committerkintel <kintel@cb376a5e-1013-0410-a455-b6b1f9ac8223>2009-05-03 20:40:11 +0000
commita1d7d9a416946cd452d87670d2bc15826112dfc4 (patch)
treed945bc04290f6936d78c055147ac0cbc5c4c6404 /trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator
parent39a9ab7ee426f2a5c114b967e43aa9160d253ad3 (diff)
downloadreprap-backup-a1d7d9a416946cd452d87670d2bc15826112dfc4.tar.gz
reprap-backup-a1d7d9a416946cd452d87670d2bc15826112dfc4.zip
bugfix: Only use user-applied textures if they're not null
git-svn-id: https://reprap.svn.sourceforge.net/svnroot/reprap@2849 cb376a5e-1013-0410-a455-b6b1f9ac8223
Diffstat (limited to 'trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator')
-rw-r--r--trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java b/trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
index d605670a..85644521 100644
--- a/trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
+++ b/trunk/reprap/miscellaneous/AoI/plugins/CSGEvaluator/src/org/reprap/artofillusion/ParsedTree.java
@@ -50,7 +50,9 @@ public abstract class ParsedTree {
this.aoiobj.setObject(newinfo.object);
this.aoiobj.setCoords(newinfo.coords);
- this.aoiobj.object.setTexture(tex, map);
+ if (tex != null && map != null) {
+ this.aoiobj.object.setTexture(tex, map);
+ }
this.aoiobj.setVisible(true);
this.aoiobj.clearCachedMeshes();