summaryrefslogtreecommitdiff
path: root/tools/export
diff options
context:
space:
mode:
authorJuan Linietsky <red@kyoko>2015-05-01 23:20:05 -0300
committerJuan Linietsky <red@kyoko>2015-05-01 23:20:05 -0300
commitfb8b740fcb50dc38526b458af096b72d1303d3e5 (patch)
treeacebf5feee10fb9026e45508ba0cc316208fd213 /tools/export
parentb56badf77b652abca012dd4dbd4932a03e4139dd (diff)
-fixed default godot logo
-made the packagename generated from name by default
Diffstat (limited to 'tools/export')
-rw-r--r--tools/export/blender25/io_scene_dae/export_dae.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/tools/export/blender25/io_scene_dae/export_dae.py b/tools/export/blender25/io_scene_dae/export_dae.py
index 14db93c874..492a737e23 100644
--- a/tools/export/blender25/io_scene_dae/export_dae.py
+++ b/tools/export/blender25/io_scene_dae/export_dae.py
@@ -902,18 +902,22 @@ class DaeExporter:
if (node.data==None):
return
armature=None
+ armcount=0
+ for n in node.modifiers:
+ if (n.type=="ARMATURE"):
+ armcount+=1
if (node.parent!=None):
if (node.parent.type=="ARMATURE"):
armature=node.parent
- armcount=0
- for n in node.modifiers:
- if (n.type=="ARMATURE"):
- armcount+=1
- if (armcount>1):
- self.operator.report({'WARNING'},'Object "'+node.name+'" refers to more than one armature! This is unsopported.')
+ if (armcount>1):
+ self.operator.report({'WARNING'},'Object "'+node.name+'" refers to more than one armature! This is unsopported.')
+ if (armcount==0):
+ self.operator.report({'WARNING'},'Object "'+node.name+'" is child of an armature, but has no armature modifier.')
+ if (armcount>0 and not armature):
+ self.operator.report({'WARNING'},'Object "'+node.name+'" has armature modifier, but is not a child of an armature. This is unsupported.')
if (node.data.shape_keys!=None):