Revision: 36732 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36732 Author: jesterking Date: 2011-05-17 16:20:07 +0000 (Tue, 17 May 2011) Log Message: ----------- fix for r36723 - putting extern Material inside code like that results in wrong linking. Move to proper place so that linking goes right.
Revision Links: -------------- http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36723 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 2011-05-17 15:39:40 UTC (rev 36731) +++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp 2011-05-17 16:20:07 UTC (rev 36732) @@ -143,9 +143,11 @@ #include "BKE_customdata.h" #include "BKE_cdderivedmesh.h" #include "BKE_DerivedMesh.h" +#include "BKE_material.h" /* give_current_material */ + +extern Material defmaterial; /* material.c */ } -#include "BKE_material.h" /* give_current_material */ /* end of blender include block */ #include "KX_BlenderInputDevice.h" @@ -839,7 +841,6 @@ /* ckeck for texface since texface _only_ is used as a fallback */ if(ma == NULL && tface == NULL) { - extern Material defmaterial; /* material.c */ ma= &defmaterial; } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs