diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2013-01-05 12:53:39 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2013-01-05 12:53:39 +0400 |
| commit | 9106b3b10782da51814d3a859eebae51085c374c (patch) | |
| tree | 45bd8f44791ab5f7ce7f2097cad3090cb8ba8f5e /source/gameengine/Converter | |
| parent | 9611202f285547d9791a793581c2641349bc2211 (diff) | |
BGE: Fix for [#33769] "Material friction settings are ignored" reported by Alex Fraser (z0r).
As of r53332, give_current_material() won't accept a 0 index and return NULL. CreateMaterialFromBlenderObject() was using index 0 to just grab the first material. Since this now returned NULL, it would use default settings. We'll just ask for index 1 now instead.
Diffstat (limited to 'source/gameengine/Converter')
| -rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index a873f8ba281..a4c4253754e 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -1264,7 +1264,7 @@ static PHY_MaterialProps *CreateMaterialFromBlenderObject(struct Object* blender MT_assert(materialProps && "Create physics material properties failed"); - Material* blendermat = give_current_material(blenderobject, 0); + Material* blendermat = give_current_material(blenderobject, 1); if (blendermat) { |