Revision: 16675
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16675
Author:   migius
Date:     2008-09-22 16:01:35 +0200 (Mon, 22 Sep 2008)

Log Message:
-----------
colladaImEx/collada.py
- class DaeFxSampler2D(DaeElement): added def AddShader(self, daeShader) 

- fix for Bug 12400: Collada exporter: incorrect url when using "convex hull 
polytope" for bounds.
 Added '#'-prefix to def ConvexMesh string
 Thank for Mattias Linde (linde) for the hint.

Modified Paths:
--------------
    trunk/blender/release/scripts/bpymodules/colladaImEx/collada.py

Modified: trunk/blender/release/scripts/bpymodules/colladaImEx/collada.py
===================================================================
--- trunk/blender/release/scripts/bpymodules/colladaImEx/collada.py     
2008-09-22 13:01:51 UTC (rev 16674)
+++ trunk/blender/release/scripts/bpymodules/colladaImEx/collada.py     
2008-09-22 14:01:35 UTC (rev 16675)
@@ -768,7 +768,7 @@
 
        def SaveToXml(self, daeDocument):
                node = super(DaeConvexMesh, self).SaveToXml(daeDocument)
-               SetAttribute(node, DaeSyntax.CONVEX_HULL_OF, 
StripString(self.convexHullOf))
+               SetAttribute(node, DaeSyntax.CONVEX_HULL_OF, 
StripString('#'+self.convexHullOf))
                return node
 
 class DaeMesh(DaeEntity):
@@ -2270,7 +2270,10 @@
        def __str__(self):
                return super(DaeFxSampler2D, self).__str__() + ', source: %s, 
minfilter: %s, maxfilter: %s' % (self.source, self.minfilter, self.maxfilter)
 
+       def AddShader(self, daeShader):
+               self.profileCommon.technique.shader = daeShader
 
+
 class DaeFxSurface(DaeElement):
        def __init__(self):
                super(DaeFxSurface, self).__init__()


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to