diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-05-17 20:20:07 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-05-17 20:20:07 +0400 |
| commit | 2eed2a7f58c301be04d307bd9c99b05eda55e4b6 (patch) | |
| tree | 4b6be65a737076dd27fcebc72dc228b1141a0a81 /source/gameengine/Converter | |
| parent | 392975379403afcb1b7e57cc544614a81dd54741 (diff) | |
fix for r36723 - putting extern Material inside code like that results in wrong linking. Move to proper place so that linking goes right.
Diffstat (limited to 'source/gameengine/Converter')
| -rw-r--r-- | source/gameengine/Converter/BL_BlenderDataConversion.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 82096db9131..1fb30925446 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -143,9 +143,11 @@ extern "C" { #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 @@ RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, KX_Scene* scene, /* ckeck for texface since texface _only_ is used as a fallback */ if(ma == NULL && tface == NULL) { - extern Material defmaterial; /* material.c */ ma= &defmaterial; } |