From 9106b3b10782da51814d3a859eebae51085c374c Mon Sep 17 00:00:00 2001 From: Mitchell Stokes Date: Sat, 5 Jan 2013 08:53:39 +0000 Subject: 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. --- source/gameengine/Converter/BL_BlenderDataConversion.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/gameengine/Converter') 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) { -- cgit v1.2.3