From 4dd9ea766c9db4899408cae923f2f6ac11208476 Mon Sep 17 00:00:00 2001 From: ousttrue Date: Sat, 10 Jul 2010 03:38:31 +0900 Subject: [PATCH] fix 2.4. --- swig/blender/bl24.py | 6 +++--- swig/blender/bl25.py | 2 +- swig/blender/pmd_import.py | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/swig/blender/bl24.py b/swig/blender/bl24.py index 034d461..3732a73 100755 --- a/swig/blender/bl24.py +++ b/swig/blender/bl24.py @@ -354,7 +354,7 @@ class material: @staticmethod def getTexture(m, index): - return m.textures[index] + return m.textures[index].tex @staticmethod def hasTexture(m): @@ -362,10 +362,10 @@ class material: @staticmethod def setUseTexture(m, index, enable): - enable_textures=set(m.enabledTextures) + enabledTextures=set(m.enabledTextures) if enable: enabledTextures.add(index) - else; + else: enabledTextures.remove(index) m.enabledTextures=list(enabledTextures) diff --git a/swig/blender/bl25.py b/swig/blender/bl25.py index 52a61b1..43fe6d8 100755 --- a/swig/blender/bl25.py +++ b/swig/blender/bl25.py @@ -327,7 +327,7 @@ class material: @staticmethod def getTexture(material, index): - return material.texture_slots[index] + return material.texture_slots[index].texture @staticmethod def hasTexture(material): diff --git a/swig/blender/pmd_import.py b/swig/blender/pmd_import.py index 9590d7e..192e995 100755 --- a/swig/blender/pmd_import.py +++ b/swig/blender/pmd_import.py @@ -81,13 +81,7 @@ if isBlender24(): def createPmdMaterial(m, index): material=Blender.Material.New() - #material.setRef(1) - #material.diffuseSize = 3.14/2 - #material.setDiffuseSmooth(0) - #material.setSpecSize(0) - #material.setSpec(0) - # shader - # diffuse + # fresnelが無いw material.setDiffuseShader(Blender.Material.Shaders.DIFFUSE_TOON) material.setRGBCol([m.diffuse.r, m.diffuse.g, m.diffuse.b]) material.setAlpha(m.diffuse.a) @@ -115,8 +109,14 @@ if isBlender24(): elif n.startswith("ankle_"): b.lockYRot=True - def setSphereMap(material, index, blende_type=None): - pass + def setSphereMap(material, index, blend_type='MULTIPLY'): + slot=material.textures[index] + slot.mapto=Blender.Texture.MapTo.NOR + slot.mapping=Blender.Texture.Mappings.SPHERE + if blend_type=='MULTIPLY': + slot.blendmode=Blender.Texture.BlendModes.MULTIPLY + elif blend_type=='ADD': + slot.blendmode=Blender.Texture.BlendModes.ADD else: # for 2.5 @@ -450,7 +450,7 @@ def __import16MaerialAndMesh(meshObject, l, bl.material.getTexture( toon_material, 0 if m.toon_index==0xFF else m.toon_index - ).texture, + ), False) texture_name=m.getTexture() -- 2.11.0