From cae26e2b52941d00874ff671dbc2637c42248aac Mon Sep 17 00:00:00 2001 From: Josh Wilson Date: Thu, 17 Nov 2005 00:40:57 +0000 Subject: [PATCH] sizeFromTexels defaults to False now --- .../src/particles/SpriteParticleRendererExt.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/direct/src/particles/SpriteParticleRendererExt.py b/direct/src/particles/SpriteParticleRendererExt.py index 3ea9cd3ddd..a6b573dc99 100644 --- a/direct/src/particles/SpriteParticleRendererExt.py +++ b/direct/src/particles/SpriteParticleRendererExt.py @@ -77,12 +77,11 @@ class SpriteParticleRendererExt(SpriteParticleRenderer): # Set instance copy of class variable self.sourceNodeName = name - def setTextureFromNode(self, modelName = None, nodeName = None, sizeFromTexels = True): + def setTextureFromNode(self, modelName = None, nodeName = None, sizeFromTexels = False): if modelName == None: - modelName = self.getSourceFileName() - - if nodeName == None: - nodeName = self.getSourceNodeName() + modelName = self.getSourceFileName() + if nodeName == None: + nodeName = self.getSourceNodeName() # Load model and get texture m = loader.loadModelOnce(modelName) @@ -102,15 +101,14 @@ class SpriteParticleRendererExt(SpriteParticleRenderer): m.removeNode() return True - def addTextureFromNode(self, modelName = None, nodeName = None, sizeFromTexels = True): + def addTextureFromNode(self, modelName = None, nodeName = None, sizeFromTexels = False): if(self.getNumAnims == 0): return self.setTextureFromNode(modelName,nodeName,sizeFromTexels) if modelName == None: - modelName = self.getSourceFileName() - - if nodeName == None: - nodeName = self.getSourceNodeName() + modelName = self.getSourceFileName() + if nodeName == None: + nodeName = self.getSourceNodeName() # Load model and get texture m = loader.loadModelOnce(modelName)