From 6851f9bfaefdd70eb009efdede444d3238c7277c Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 8 Dec 2014 15:47:45 -0300 Subject: Small Fixes -=-=-=-=-=- -Bug in navmesh demo fixed -Bug in variant -Better Collada Exporter supports proper names of exported shapekeys --- tools/export/blender25/io_scene_dae/export_dae.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'tools/export/blender25/io_scene_dae') 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,'') + if (custom_name!=None): + self.writel(S_GEOM,1,'') + else: + self.writel(S_GEOM,1,'') self.writel(S_GEOM,2,'') -- cgit v1.2.3