diff options
Diffstat (limited to 'source/gameengine/Converter/BL_ModifierDeformer.cpp')
| -rw-r--r-- | source/gameengine/Converter/BL_ModifierDeformer.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/source/gameengine/Converter/BL_ModifierDeformer.cpp b/source/gameengine/Converter/BL_ModifierDeformer.cpp index 53755deefe1..eafed8497ba 100644 --- a/source/gameengine/Converter/BL_ModifierDeformer.cpp +++ b/source/gameengine/Converter/BL_ModifierDeformer.cpp @@ -29,9 +29,10 @@ * \ingroup bgeconv */ -#ifdef _MSC_VER -# pragma warning (disable:4786) -#endif + +#if defined(WIN32) && !defined(FREE_WINDOWS) +#pragma warning (disable : 4786) +#endif //WIN32 #include "MEM_guardedalloc.h" #include "BL_ModifierDeformer.h" @@ -41,6 +42,7 @@ #include "RAS_MeshObject.h" #include "PHY_IGraphicController.h" +//#include "BL_ArmatureController.h" #include "DNA_armature_types.h" #include "DNA_action_types.h" #include "DNA_key_types.h" @@ -63,6 +65,7 @@ extern "C"{ #include "BKE_lattice.h" #include "BKE_modifier.h" } + #include "BLI_blenlib.h" #include "BLI_math.h" @@ -110,7 +113,7 @@ bool BL_ModifierDeformer::HasCompatibleDeformer(Object *ob) if ((ob->gameflag & OB_SOFT_BODY) != 0) return false; ModifierData* md; - for (md = (ModifierData *)ob->modifiers.first; md; md = md->next) { + for (md = (ModifierData*)ob->modifiers.first; md; md = (ModifierData*)md->next) { if (modifier_dependsOnTime(md)) continue; if (!(md->mode & eModifierMode_Realtime)) |