Revision: 16627
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16627
Author: migius
Date: 2008-09-20 13:04:01 +0200 (Sat, 20 Sep 2008)
Log Message:
-----------
collada imp/exp
patch from http://colladablender.illusoft.com/mantis/view.php?id=109
bugfix: 'maxfilter' element should be 'magfilter'
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-20 10:30:10 UTC (rev 16626)
+++ trunk/blender/release/scripts/bpymodules/colladaImEx/collada.py
2008-09-20 11:04:01 UTC (rev 16627)
@@ -2250,21 +2250,21 @@
self.syntax = DaeFxSyntax.SAMPLER2D
self.source = DaeSamplerSource();
self.minfilter = DaeMinFilter();
- self.maxfilter = DaeMaxFilter();
+ self.magfilter = DaeMagFilter();
def LoadFromXml(self, daeDocument, xmlNode):
super(DaeFxSampler2D, self).LoadFromXml(daeDocument, xmlNode)
self.source =
str(xmlUtils.ReadContents(xmlUtils.FindElementByTagName(xmlNode,
DaeSyntax.SOURCE)))
#remi self.source = CreateObjectFromXml(daeDocument, xmlNode, "source",
DaeSyntax.SOURCE)
self.minfilter = CreateObjectFromXml(daeDocument, xmlNode,
"minfilter", DaeMinFilter)
- self.maxfilter = CreateObjectFromXml(daeDocument, xmlNode,
"maxfilter", DaeMaxFilter)
+ self.magfilter = CreateObjectFromXml(daeDocument, xmlNode,
"magfilter", DaeMagFilter)
def SaveToXml(self, daeDocument):
node = super(DaeFxSampler2D,self).SaveToXml(daeDocument)
# if debprn: print 'deb:####class DaeFxSampler2D SaveToXml
self.source=', self.source #----------
AppendChild(daeDocument, node, self.source) #bug----
AppendChild(daeDocument, node, self.minfilter);
- AppendChild(daeDocument, node, self.maxfilter);
+ AppendChild(daeDocument, node, self.magfilter);
return node
def __str__(self):
@@ -2323,9 +2323,9 @@
AppendTextInChild(node, self.value)
return node
-class DaeMaxFilter(DaeElement):
+class DaeMagFilter(DaeElement):
def __init__(self):
- self.syntax = "maxfilter"
+ self.syntax = "magfilter"
self.id = ""
self.name = ""
self.value = "LINEAR";
@@ -2334,7 +2334,7 @@
self.value = xmlUtils.ReadContents(xmlNode)
def SaveToXml(self, daeDocument):
- node = super(DaeMaxFilter,self).SaveToXml(daeDocument)
+ node = super(DaeMagFilter,self).SaveToXml(daeDocument)
AppendTextInChild(node, self.value)
return node
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
