[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53576] trunk/blender/source/gameengine/ Converter/BL_BlenderDataConversion.cpp: BGE: Fix for [#33769] " Material friction settings are ignored" reported by Alex Fraser (z0r).

[Mitchell Stokes]

Revision: 53576
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53576
Author:   moguri
Date:     2013-01-05 08:53:39 +0000 (Sat, 05 Jan 2013)
Log Message:
-----------
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.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53332

Modified Paths:
--------------
    trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp

Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2013-01-05 08:24:22 UTC (rev 53575)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2013-01-05 08:53:39 UTC (rev 53576)
@@ -1264,7 +1264,7 @@
 	
 	MT_assert(materialProps && "Create physics material properties failed");
 		
-	Material* blendermat = give_current_material(blenderobject, 0);
+	Material* blendermat = give_current_material(blenderobject, 1);
 		
 	if (blendermat)
 	{