diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-07-26 08:36:09 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-07-26 08:36:09 +0400 |
| commit | b059a3c765a59377fef22723acb11929d7fe70b6 (patch) | |
| tree | 311c2ad1f67fa8fcfb2875bb0c1af8bdaef3ebc4 /source/gameengine/Converter/BL_BlenderDataConversion.cpp | |
| parent | ad27c65d02de00d57343ec183849e476dcfae211 (diff) | |
svn merge -r15731:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/gameengine/Converter/BL_BlenderDataConversion.cpp')
| -rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index c0051657658..3f5246fd893 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -1920,10 +1920,8 @@ void BL_ConvertBlenderObjects(struct Main* maggie, gameobj->NodeUpdateGS(0,true); BL_ConvertIpos(blenderobject,gameobj,converter); - // TODO: expand to multiple ipos per mesh - Material *mat = give_current_material(blenderobject, 1); - if(mat) BL_ConvertMaterialIpos(mat, gameobj, converter); - + BL_ConvertMaterialIpos(blenderobject, gameobj, converter); + sumolist->Add(gameobj->AddRef()); BL_ConvertProperties(blenderobject,gameobj,timemgr,kxscene,isInActiveLayer); @@ -2102,9 +2100,7 @@ void BL_ConvertBlenderObjects(struct Main* maggie, gameobj->NodeUpdateGS(0,true); BL_ConvertIpos(blenderobject,gameobj,converter); - // TODO: expand to multiple ipos per mesh - Material *mat = give_current_material(blenderobject, 1); - if(mat) BL_ConvertMaterialIpos(mat, gameobj, converter); + BL_ConvertMaterialIpos(blenderobject,gameobj, converter); sumolist->Add(gameobj->AddRef()); |