summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-01-05 10:38:13 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-01-05 10:38:13 -0300
commitafaa57be301e00d5e6a797846234b4790fbb1576 (patch)
tree3d220660eb7e8c53b5c49bea210653d43ec9be03 /tools
parent010e3e0ac7edb93c83ac807438548d9b4b26605f (diff)
parent8f4aef774d42af7354a93309b1f5149580f3b964 (diff)
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'tools')
-rw-r--r--tools/export/blender25/io_scene_dae/export_dae.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/export/blender25/io_scene_dae/export_dae.py b/tools/export/blender25/io_scene_dae/export_dae.py
index b846f0e2d8..7ee0e179b8 100644
--- a/tools/export/blender25/io_scene_dae/export_dae.py
+++ b/tools/export/blender25/io_scene_dae/export_dae.py
@@ -921,7 +921,7 @@ class DaeExporter:
if (node.parent.type=="ARMATURE"):
armature=node.parent
if (armcount>1):
- self.operator.report({'WARNING'},'Object "'+node.name+'" refers to more than one armature! This is unsopported.')
+ self.operator.report({'WARNING'},'Object "'+node.name+'" refers to more than one armature! This is unsupported.')
if (armcount==0):
self.operator.report({'WARNING'},'Object "'+node.name+'" is child of an armature, but has no armature modifier.')