summaryrefslogtreecommitdiff
path: root/tools/export/blender25/io_scene_dae
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-12-08 15:47:45 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-12-08 15:47:45 -0300
commit6851f9bfaefdd70eb009efdede444d3238c7277c (patch)
treed7e90b45dcdcc792c57ca1d61adab274d8e30507 /tools/export/blender25/io_scene_dae
parent9df8d5f616dbb3f81299ccca4929c0a8f46a6d79 (diff)
Small Fixes
-=-=-=-=-=- -Bug in navmesh demo fixed -Bug in variant -Better Collada Exporter supports proper names of exported shapekeys
Diffstat (limited to 'tools/export/blender25/io_scene_dae')
-rw-r--r--tools/export/blender25/io_scene_dae/export_dae.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/export/blender25/io_scene_dae/export_dae.py b/tools/export/blender25/io_scene_dae/export_dae.py
index c41b60f2e6..4e1635429b 100644
--- a/tools/export/blender25/io_scene_dae/export_dae.py
+++ b/tools/export/blender25/io_scene_dae/export_dae.py
@@ -335,7 +335,7 @@ class DaeExporter:
return matid
- def export_mesh(self,node,armature=None,skeyindex=-1,skel_source=None):
+ def export_mesh(self,node,armature=None,skeyindex=-1,skel_source=None,custom_name=None):
mesh = node.data
@@ -372,9 +372,9 @@ class DaeExporter:
# self.export_node(node,il,shape.name)
node.data.update()
if (armature and k==0):
- md=self.export_mesh(node,armature,k,mid)
+ md=self.export_mesh(node,armature,k,mid,shape.name)
else:
- md=self.export_mesh(node,None,k)
+ md=self.export_mesh(node,None,k,None,shape.name)
node.data = p
node.data.update()
@@ -596,7 +596,10 @@ class DaeExporter:
meshid = self.new_id("mesh")
- self.writel(S_GEOM,1,'<geometry id="'+meshid+'" name="'+mesh.name+'">')
+ if (custom_name!=None):
+ self.writel(S_GEOM,1,'<geometry id="'+meshid+'" name="'+custom_name+'">')
+ else:
+ self.writel(S_GEOM,1,'<geometry id="'+meshid+'" name="'+mesh.name+'">')
self.writel(S_GEOM,2,'<mesh>')