code cleanup: check for msvc directly when using warning pragma's.
authorCampbell Barton <ideasman42@gmail.com>
Mon, 15 Oct 2012 02:15:07 +0000 (02:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 15 Oct 2012 02:15:07 +0000 (02:15 +0000)
62 files changed:
intern/ghost/GHOST_Types.h
intern/ghost/intern/GHOST_Debug.h
intern/ghost/test/multitest/MultiTest.c
release/windows/contrib/vfapi/vfapi-plugin.c
source/blender/blenlib/intern/freetypefont.c
source/blender/blenlib/intern/noise.c
source/blender/blenlib/intern/rand.c
source/blender/blenloader/intern/writefile.c
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp
source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
source/gameengine/BlenderRoutines/KX_BlenderSystem.cpp
source/gameengine/Converter/BL_ArmatureActuator.h
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/BL_DeformableGameObject.h
source/gameengine/Converter/BL_MeshDeformer.cpp
source/gameengine/Converter/BL_MeshDeformer.h
source/gameengine/Converter/BL_ModifierDeformer.cpp
source/gameengine/Converter/BL_ModifierDeformer.h
source/gameengine/Converter/BL_ShapeDeformer.cpp
source/gameengine/Converter/BL_ShapeDeformer.h
source/gameengine/Converter/BL_SkinDeformer.cpp
source/gameengine/Converter/BL_SkinDeformer.h
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
source/gameengine/Converter/KX_ConvertActuators.cpp
source/gameengine/Converter/KX_ConvertSensors.cpp
source/gameengine/Converter/KX_IpoConvert.cpp
source/gameengine/Converter/KX_SoftBodyDeformer.cpp
source/gameengine/Converter/KX_SoftBodyDeformer.h
source/gameengine/Expressions/Value.h
source/gameengine/Expressions/VectorValue.cpp
source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
source/gameengine/GameLogic/SCA_DelaySensor.cpp
source/gameengine/GameLogic/SCA_LogicManager.h
source/gameengine/GameLogic/SCA_MouseManager.cpp
source/gameengine/GameLogic/SCA_TimeEventManager.cpp
source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
source/gameengine/GamePlayer/common/GPC_MouseDevice.h
source/gameengine/GamePlayer/ghost/GPG_Canvas.h
source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h
source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_GameObject.h
source/gameengine/Ketsji/KX_IPO_SGController.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Ketsji/KX_Light.cpp
source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
source/gameengine/Ketsji/KX_PyMath.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/KX_Scene.cpp
source/gameengine/Ketsji/KX_TimeCategoryLogger.h
source/gameengine/Ketsji/KX_TimeLogger.h
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
source/gameengine/Rasterizer/RAS_BucketManager.cpp
source/gameengine/Rasterizer/RAS_Deformer.h
source/gameengine/Rasterizer/RAS_IRasterizer.h
source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
source/gameengine/Rasterizer/RAS_MeshObject.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
source/gameengine/Rasterizer/RAS_Polygon.cpp

index c6d364c361cb56b77cb0b467e7d61b36fdabd459..9b563ef7e556ca5bd1b9f6de1fcbead64ecf65eb 100644 (file)
@@ -50,7 +50,7 @@ typedef unsigned short GHOST_TUns16;
 typedef int GHOST_TInt32;
 typedef unsigned int GHOST_TUns32;
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
+#ifdef _MSC_VER
 typedef __int64 GHOST_TInt64;
 typedef unsigned __int64 GHOST_TUns64;
 #else
index c364f1d26a4bb5d5a3acf22955764f51f80ee3dd..f0db1b3de8d979c05912ef41493a48b63ccf3429 100644 (file)
 #ifndef __GHOST_DEBUG_H__
 #define __GHOST_DEBUG_H__
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
+#ifdef _MSC_VER
 #  ifdef DEBUG
 #    pragma warning (disable:4786) // suppress stl-MSVC debug info warning
      // #define GHOST_DEBUG
 #  endif // DEBUG
-#endif // WIN32
+#endif // _MSC_VER
 
 #ifdef WITH_GHOST_DEBUG 
 #  define GHOST_DEBUG // spit ghost events to stdout
index 5d207dafaafef3775887574996e787bf0c860bb2..2d0afcf671ca2f6c803c8a9c250de4c3229e2f10 100644 (file)
@@ -26,9 +26,8 @@
  */
 #define FALSE 0
 
-#ifdef WIN32
-
-#pragma warning(disable: 4244 4305)
+#ifdef _MSC_VER
+#  pragma warning(disable: 4244 4305)
 #endif
 
 #include <stdlib.h>
index 8d63baa0ce42fd5d617c6ce7482cbeeabe27ee30..0af96d14d6fe7ecb605e70bc9aaf2c1503362124 100644 (file)
@@ -15,7 +15,6 @@
  *
  */
 
-
 #include <windows.h>
 #include <winbase.h>
 #include <stdio.h>
@@ -83,16 +82,16 @@ typedef     struct {
 } VF_ReadData_Audio,*LPVF_ReadData_Audio;
 
 typedef        struct {
-       DWORD   dwSize;                 
-       HRESULT (__stdcall *OpenFile)( 
-               char *lpFileName, LPVF_FileHandle lpFileHandle );
+       DWORD   dwSize;
+       HRESULT (__stdcall *OpenFile)(
+               char *lpFileName, LPVF_FileHandle lpFileHandle );
        HRESULT (__stdcall *CloseFile)( VF_FileHandle hFileHandle );
        HRESULT (__stdcall *GetFileInfo)( VF_FileHandle hFileHandle,
-                                        LPVF_FileInfo lpFileInfo );
+                                         LPVF_FileInfo lpFileInfo );
        HRESULT (__stdcall *GetStreamInfo)( VF_FileHandle hFileHandle,
-                                          DWORD dwStream,void *lpStreamInfo );
+                                           DWORD dwStream,void *lpStreamInfo );
        HRESULT (__stdcall *ReadData)( VF_FileHandle hFileHandle,
-                                     DWORD dwStream,void *lpData ); 
+                                      DWORD dwStream,void *lpData );
 } VF_PluginFunc,*LPVF_PluginFunc;
 
 __declspec(dllexport) HRESULT vfGetPluginInfo( 
@@ -117,8 +116,9 @@ static unsigned long getipaddress(const char * ipaddr)
        struct hostent  *host;
        unsigned long   ip;
 
-       if (((ip = inet_addr(ipaddr)) == INADDR_NONE)
-       && strcmp(ipaddr, "255.255.255.255") != 0) {
+       if (((ip = inet_addr(ipaddr)) == INADDR_NONE) &&
+           strcmp(ipaddr, "255.255.255.255") != 0)
+       {
                if ((host = gethostbyname(ipaddr)) != NULL) {
                        memcpy(&ip, host->h_addr, sizeof(ip));
                }
@@ -419,6 +419,3 @@ __declspec(dllexport) HRESULT vfGetPluginFunc(
 
        return VF_OK;
 }
-
-
-
index 8523927054104993c2e660639ebde8ee5aec522e..daedd39d693c3f16aeeab85f291a214cb120ac0f 100644 (file)
@@ -33,8 +33,8 @@
  */
 
 
-#ifdef WIN32
-#pragma warning (disable:4244)
+#ifdef _MSC_VER
+#  pragma warning (disable:4244)
 #endif
 
 #include <ft2build.h>
index 792bf929182c92977a71e7e19163d72d332e01ca..124624ca1374ad43fc6f263e2c05439dfaae8f97 100644 (file)
@@ -31,9 +31,9 @@
  */
 
 
-#ifdef _WIN32   
-#pragma warning (disable : 4244) // "conversion from double to float"
-#pragma warning (disable : 4305) // "truncation from const double to float" 
+#ifdef _MSC_VER
+#  pragma warning (disable:4244)  /* "conversion from double to float" */
+#  pragma warning (disable:4305)  /* "truncation from const double to float" */
 #endif
 
 #include <math.h>
index 4435e9ce09c8136022be1cea4b657fcfee940d53..3c22d73d1133fc6808a647f90bb969267f974708 100644 (file)
@@ -40,7 +40,7 @@
 #include "BLI_threads.h"
 #include "BLI_rand.h"
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
+#ifdef _MSC_VER
 typedef unsigned __int64 r_uint64;
 
 #define MULTIPLIER  0x5DEECE66Di64
index b73485add3db1f1831d1897642aa79b0314a8d92..ab7f5d46f8b6566e44f65d3ec606736a938fda9e 100644 (file)
@@ -777,13 +777,16 @@ typedef struct RenderInfo {
        char scene_name[MAX_ID_NAME - 2];
 } RenderInfo;
 
-static void write_renderinfo(WriteData *wd, Main *mainvar)             /* for renderdeamon */
+/* was for historic render-deamon feature,
+ * now write because it can be easily extracted without
+ * reading the whole blend file */
+static void write_renderinfo(WriteData *wd, Main *mainvar)
 {
        bScreen *curscreen;
        Scene *sce;
        RenderInfo data;
 
-       /* XXX in future, handle multiple windows with multiple screnes? */
+       /* XXX in future, handle multiple windows with multiple screens? */
        current_screen_compat(mainvar, &curscreen);
 
        for (sce= mainvar->scene.first; sce; sce= sce->id.next) {
index 5cfa97e2e7e7491a9443b11bb76fb19fb9ad6620..6807f531f0a76f6fdbf9db4d2a7ad0a352605ca6 100644 (file)
@@ -35,9 +35,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// don't show stl-warnings
-#pragma warning (disable:4786)
+#ifdef _MSC_VER
+   /* don't show stl-warnings */
+#  pragma warning (disable:4786)
 #endif
 
 #include "GL/glew.h"
 #include "Value.h"
 
 
-
-#ifdef __cplusplus
 extern "C" {
-#endif
-       /***/
-#include "DNA_view3d_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_userdef_types.h"
-#include "DNA_windowmanager_types.h"
-#include "BKE_global.h"
-#include "BKE_report.h"
-
-#include "MEM_guardedalloc.h"
-
-/* #include "BKE_screen.h" */ /* cant include this because of 'new' function name */
-extern float BKE_screen_view3d_zoom_to_fac(float camzoom);
-
-#include "BKE_main.h"
-#include "BLI_blenlib.h"
-#include "BLO_readfile.h"
-#include "DNA_scene_types.h"
-#include "BKE_ipo.h"
-       /***/
-
-#include "BKE_context.h"
-#include "../../blender/windowmanager/WM_types.h"
-#include "../../blender/windowmanager/wm_window.h"
-#include "../../blender/windowmanager/wm_event_system.h"
-#ifdef __cplusplus
+       #include "DNA_view3d_types.h"
+       #include "DNA_screen_types.h"
+       #include "DNA_userdef_types.h"
+       #include "DNA_scene_types.h"
+       #include "DNA_windowmanager_types.h"
+
+       #include "BKE_global.h"
+       #include "BKE_report.h"
+       #include "BKE_ipo.h"
+       #include "BKE_main.h"
+       #include "BKE_context.h"
+
+       /* avoid c++ conflict with 'new' */
+       #define new _new
+       #include "BKE_screen.h"
+       #undef new
+
+       #include "MEM_guardedalloc.h"
+
+       #include "BLI_blenlib.h"
+       #include "BLO_readfile.h"
+
+       #include "../../blender/windowmanager/WM_types.h"
+       #include "../../blender/windowmanager/wm_window.h"
+       #include "../../blender/windowmanager/wm_event_system.h"
 }
-#endif
 
 #ifdef WITH_AUDASPACE
 #  include "AUD_C-API.h"
index bb476ed497af183b64cc74b670958eabc3f43b6a..a183d4059f8a9f8ffea7555acc355906208b3d79 100644 (file)
@@ -32,8 +32,8 @@
 #ifndef __KX_BLENDERINPUTDEVICE_H__
 #define __KX_BLENDERINPUTDEVICE_H__
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning(disable : 4786)  // shut off 255 char limit debug template warning
+#ifdef _MSC_VER
+#  pragma warning(disable:4786)  // shut off 255 char limit debug template warning
 #endif
 
 #include <map>
index 54c60096812c33387051117ad1950ceb2e45b2d6..f4e325eabb8a220482e657a07e0b4117821eff89 100644 (file)
@@ -30,9 +30,9 @@
  */
 
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// annoying warnings about truncated STL debug info
-#pragma warning (disable :4786)
+#ifdef _MSC_VER
+   /* annoying warnings about truncated STL debug info */
+#  pragma warning (disable:4786)
 #endif 
 
 #include "KX_BlenderKeyboardDevice.h"
index 5cd2038163c20f830dfaa3df03a643e73ae2ddb3..aa2392ded0884fd97361aabfbe1211cd9b4efc8a 100644 (file)
  *  \ingroup blroutines
  */
 
-
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// annoying warnings about truncated STL debug info
-#pragma warning (disable :4786)
+#ifdef _MSC_VER
+   /* annoying warnings about truncated STL debug info */
+#  pragma warning (disable:4786)
 #endif 
 
 #include "KX_BlenderMouseDevice.h"
index 17c9f6bfb1a7e7f4e18d45dd2f43d83fb3d7dfe8..adfaf7e3eeab6a69d0790385575af9c76c257835 100644 (file)
@@ -32,9 +32,9 @@
 #ifndef __KX_BLENDERRENDERTOOLS_H__
 #define __KX_BLENDERRENDERTOOLS_H__
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// don't show stl-warnings
-#pragma warning (disable:4786)
+#ifdef _MSC_VER
+   /* don't show stl-warnings */
+#  pragma warning (disable:4786)
 #endif
 
 #include "RAS_IRenderTools.h"
index d7d8c5121a2676f8d6767c4ea3ff5308e9c1fce6..0582e79d2699856f20d3a4887ed0357d629dafa2 100644 (file)
@@ -32,9 +32,9 @@
 
 #include "KX_ISystem.h"
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable :4786)
-#endif //WIN32
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
+#endif
 
 #ifdef WIN32
 #include <windows.h>
index a5af2bc9c09febdac6078102b6230bc1171ee33e..ba02c5aa362d4ee4481c7125c2120a9524f2db62 100644 (file)
@@ -49,13 +49,13 @@ class       BL_ArmatureActuator : public SCA_IActuator
        Py_Header
 public:
        BL_ArmatureActuator(SCA_IObject* gameobj,
-                                               int type,
-                                               const char *posechannel,
-                                               const char *constraintname,
-                                               KX_GameObject* targetobj,
-                                               KX_GameObject* subtargetobj,
-                                               float weight,
-                                               float influence);
+                           int type,
+                           const char *posechannel,
+                           const char *constraintname,
+                           KX_GameObject* targetobj,
+                           KX_GameObject* subtargetobj,
+                           float weight,
+                           float influence);
 
        virtual ~BL_ArmatureActuator();
 
index 6ffdea9f90e71dd04a9f66e04a12cb8d892961d0..912e21268743469e4fbaaea64bf60f92139c9014 100644 (file)
@@ -30,8 +30,8 @@
  *  \ingroup bgeconv
  */
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable : 4786)
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
 #endif
 
 #include <math.h>
index 6653311d496d35e85832ace86a9a621aec58ede1..95e3b7c517d919b64615daa82d10c90205c72c2e 100644 (file)
@@ -32,9 +32,9 @@
 #ifndef __BL_DEFORMABLEGAMEOBJECT_H__
 #define __BL_DEFORMABLEGAMEOBJECT_H__
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif  /* WIN32 */
+#ifdef _MSC_VER
+#  pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
+#endif
 
 #include "DNA_mesh_types.h"
 #include "KX_GameObject.h"
index b8002d05f1888f4f80214e08d751723aef349771..0d3c0d269fc5c3f88e4b73c29cce6e6fe7801920 100644 (file)
  *  \ingroup bgeconv
  */
 
-
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// This warning tells us about truncation of __long__ stl-generated names.
-// It can occasionally cause DevStudio to have internal compiler warnings.
-#pragma warning( disable : 4786 )     
+#ifdef _MSC_VER
+  /* This warning tells us about truncation of __long__ stl-generated names.
+   * It can occasionally cause DevStudio to have internal compiler warnings. */
+#  pragma warning( disable:4786 )
 #endif
 
 #include "RAS_IPolygonMaterial.h"
index 7bee55bd1194feadeef28e052c6e5e20b35fe9e9..6e84cdf03f82b2438a791e97dcf9a00384f28dab 100644 (file)
@@ -38,9 +38,9 @@
 #include "MT_Point3.h"
 #include <stdlib.h>
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif  /* WIN32 */
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)  /* get rid of stupid stl-visual compiler debug warning */
+#endif
 
 class BL_DeformableGameObject;
 
index 22f62975f2c22482558e52b1293567a9ca3a0ea2..53755deefe1e141fe6d71962568e68919649b5a1 100644 (file)
  *  \ingroup bgeconv
  */
 
-
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable : 4786)
-#endif //WIN32
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
+#endif
 
 #include "MEM_guardedalloc.h"
 #include "BL_ModifierDeformer.h"
@@ -42,7 +41,6 @@
 #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"
@@ -65,7 +63,6 @@ extern "C"{
        #include "BKE_lattice.h"
        #include "BKE_modifier.h"
 }
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
index f04b41df3fc263593063085763b21b2eb8d95256..4efe4ca5bfcee7a6b0c186d7f2d2aa2bff40812a 100644 (file)
@@ -32,9 +32,9 @@
 #ifndef __BL_MODIFIERDEFORMER_H__
 #define __BL_MODIFIERDEFORMER_H__
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif  /* WIN32 */
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)  /* get rid of stupid stl-visual compiler debug warning */
+#endif
 
 #include "BL_ShapeDeformer.h"
 #include "BL_DeformableGameObject.h"
@@ -51,33 +51,34 @@ public:
 
 
        BL_ModifierDeformer(BL_DeformableGameObject *gameobj,
-                                               Scene *scene,
-                                               Object *bmeshobj,
-                                               RAS_MeshObject *mesh)
-                                               :
-                                               BL_ShapeDeformer(gameobj,bmeshobj, mesh),
-                                               m_lastModifierUpdate(-1),
-                                               m_scene(scene),
-                                               m_dm(NULL)
+                           Scene *scene,
+                           Object *bmeshobj,
+                           RAS_MeshObject *mesh)
+                           :
+                           BL_ShapeDeformer(gameobj,bmeshobj, mesh),
+                           m_lastModifierUpdate(-1),
+                           m_scene(scene),
+                           m_dm(NULL)
        {
                m_recalcNormal = false;
-       };
+       }
 
        /* this second constructor is needed for making a mesh deformable on the fly. */
        BL_ModifierDeformer(BL_DeformableGameObject *gameobj,
-                                               struct Scene *scene,
-                                               struct Object *bmeshobj_old,
-                                               struct Object *bmeshobj_new,
-                                               class RAS_MeshObject *mesh,
-                                               bool release_object,
-                                               BL_ArmatureObject* arma = NULL)
-                                               :
-                                               BL_ShapeDeformer(gameobj, bmeshobj_old, bmeshobj_new, mesh, release_object, false, arma),
-                                               m_lastModifierUpdate(-1),
-                                               m_scene(scene),
-                                               m_dm(NULL)
+                           struct Scene *scene,
+                           struct Object *bmeshobj_old,
+                           struct Object *bmeshobj_new,
+                           class RAS_MeshObject *mesh,
+                           bool release_object,
+                           BL_ArmatureObject* arma = NULL)
+                           :
+                           BL_ShapeDeformer(gameobj, bmeshobj_old, bmeshobj_new, mesh, release_object, false, arma),
+                           m_lastModifierUpdate(-1),
+                           m_scene(scene),
+                           m_dm(NULL)
        {
-       };
+               /* pass */
+       }
 
        virtual void ProcessReplica();
        virtual RAS_Deformer *GetReplica();
index f8941e16ed2059f9bb84c5f6e4dc2c2b7244f3f7..f262532e7e2e8e70340010d5faaba62205bf19d3 100644 (file)
  *  \ingroup bgeconv
  */
 
-
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable : 4786)
-#endif //WIN32
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
+#endif
 
 #include "MEM_guardedalloc.h"
 #include "BL_ShapeDeformer.h"
@@ -41,7 +40,6 @@
 #include "RAS_IPolygonMaterial.h"
 #include "RAS_MeshObject.h"
 
-//#include "BL_ArmatureController.h"
 #include "DNA_anim_types.h"
 #include "DNA_armature_types.h"
 #include "DNA_action_types.h"
@@ -60,7 +58,6 @@ extern "C"{
        #include "BKE_lattice.h"
        #include "BKE_animsys.h"
 }
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
index ff5d1e33348aeabb250c7d2e66ff5ad9c9d99602..60f27c85e4f6ccc73e300cc3bb49e718c27215c9 100644 (file)
@@ -32,9 +32,9 @@
 #ifndef __BL_SHAPEDEFORMER_H__
 #define __BL_SHAPEDEFORMER_H__
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif  /* WIN32 */
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)  /* get rid of stupid stl-visual compiler debug warning */
+#endif
 
 #include "BL_SkinDeformer.h"
 #include "BL_DeformableGameObject.h"
index 2dc6e302f4f34bad30051cfc8ce0d19c25c79ebf..e068a91bf7e1a076707544fd2d040340e0f7777b 100644 (file)
  *  \ingroup bgeconv
  */
 
-
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable : 4786)
-#endif //WIN32
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
+#endif
 
 // Eigen3 stuff used for BGEDeformVerts
 #include <Eigen/Core>
index f1e1e51dd9b50039585ea2c9b1a011fa15109311..7495deb22573e0c200abaed195d5be57e85fd304 100644 (file)
@@ -32,8 +32,8 @@
 #ifndef __BL_SKINDEFORMER_H__
 #define __BL_SKINDEFORMER_H__
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)  /* get rid of stupid stl-visual compiler debug warning */
 #endif  /* WIN32 */
 
 #include "CTR_HashedPtr.h"
@@ -56,18 +56,18 @@ public:
        void SetArmature (class BL_ArmatureObject *armobj);
 
        BL_SkinDeformer(BL_DeformableGameObject *gameobj,
-                                       struct Object *bmeshobj, 
-                                       class RAS_MeshObject *mesh,
-                                       BL_ArmatureObject* arma = NULL);
+                       struct Object *bmeshobj,
+                       class RAS_MeshObject *mesh,
+                       BL_ArmatureObject* arma = NULL);
 
        /* this second constructor is needed for making a mesh deformable on the fly. */
        BL_SkinDeformer(BL_DeformableGameObject *gameobj,
-                                       struct Object *bmeshobj_old,
-                                       struct Object *bmeshobj_new,
-                                       class RAS_MeshObject *mesh,
-                                       bool release_object,
-                                       bool recalc_normal,
-                                       BL_ArmatureObject* arma = NULL);
+                       struct Object *bmeshobj_old,
+                       struct Object *bmeshobj_new,
+                       class RAS_MeshObject *mesh,
+                       bool release_object,
+                       bool recalc_normal,
+                       BL_ArmatureObject* arma = NULL);
 
        virtual RAS_Deformer *GetReplica();
        virtual void ProcessReplica();
@@ -120,5 +120,4 @@ protected:
 #endif
 };
 
-#endif
-
+#endif  /* __BL_SKINDEFORMER_H__ */
index 9020720eaeb9f3219fdc491bb18bf55d2423dfd6..34af4038c4eb7b06b9918a997663a242a3da948f 100644 (file)
@@ -29,9 +29,8 @@
  *  \ingroup bgeconv
  */
 
-
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)  /* suppress stl-MSVC debug info warning */
 #endif
 
 #include "KX_Scene.h"
index 287be3b835938a4dac6d9bb00fd5e5747bc68d36..cc5bf4ccbbc09458467612c4bcad7a67ab2b3e71 100644 (file)
  *  \ingroup bgeconv
  */
 
-
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable : 4786) 
-#endif //WIN32
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
+#endif
 
 #include <math.h>
 
index 3d4f3ae08f2005b0fbaecd6a432a69e9dc6d98c4..859257e192d5e6ba07f2ae1f1f2652ca61171530 100644 (file)
 
 #include <stdio.h>
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable : 4786)
-#endif //WIN32
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
+#endif
 
 #include "wm_event_types.h"
 #include "KX_BlenderSceneConverter.h"
 #include "KX_ConvertSensors.h"
 
 /* This little block needed for linking to Blender... */
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#include "BLI_winstuff.h"
+#ifdef _MSC_VER
+#  include "BLI_winstuff.h"
 #endif
 
 #include "DNA_object_types.h"
index 12f8825180567233bf7c782963af718aaa520673..4fc0b0ad3ec44eb8c200b34e7ea815a9cd4420cd 100644 (file)
  *  \ingroup bgeconv
  */
 
-
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// don't show stl-warnings
-#pragma warning (disable:4786)
+#ifdef _MSC_VER
+   /* don't show stl-warnings */
+#  pragma warning (disable:4786)
 #endif
 
 #include "BKE_material.h" /* give_current_material */
index e3c12c2b966619840135a95597786d1b1e02ca8b..72d0c8733f220f6705a8d405d6f0b6af2dc4e457 100644 (file)
@@ -30,8 +30,8 @@
  */
 
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable : 4786)
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
 #endif //WIN32
 
 #include "MT_assert.h"
index de533f1c5edb48b6e2dde0b27e31984056e2479a..d7bc088e1c06f9ee5c688d63771f1d1561384607 100644 (file)
@@ -32,9 +32,9 @@
 #ifndef __KX_SOFTBODYDEFORMER_H__
 #define __KX_SOFTBODYDEFORMER_H__
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif  /* WIN32 */
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)  /* get rid of stupid stl-visual compiler debug warning */
+#endif
 
 #include "RAS_Deformer.h"
 #include "BL_DeformableGameObject.h"
index 92b5e20543cabd1e583433f2d8fba253c31ab14e..c4af3255f4a9e49427190180ef735301f419392f 100644 (file)
@@ -19,9 +19,9 @@
 #ifndef __VALUE_H__
 #define __VALUE_H__
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786)
-#endif  /* WIN32 */
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
+#endif
 
 #include <map>         // array functionality for the propertylist
 #include "STR_String.h"        // STR_String class
index 65f5d7d3d22540af85ff984e65231d3910bd18bb..ed13b0c8639bd5c8e8faf914a9aa6859d685bcdd 100644 (file)
@@ -15,8 +15,8 @@
  *
  */
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786)
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
 #endif
 
 #include "Value.h"
index 6b697f4f15b0d6caf7294d677182dd21be014913..1a6a82a33eb415d149a04b84152f16bedeadb26a 100644 (file)
  *  \ingroup gamelogic
  */
 
-
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// This warning tells us about truncation of __long__ stl-generated names.
-// It can occasionally cause DevStudio to have internal compiler warnings.
-#pragma warning( disable : 4786 )     
+#ifdef _MSC_VER
+  /* This warning tells us about truncation of __long__ stl-generated names.
+   * It can occasionally cause DevStudio to have internal compiler warnings. */
+#  pragma warning( disable:4786 )
 #endif
 
 #include "SCA_AlwaysSensor.h"
index f2bcd67e652380a96a25f92b5f98c49436fea137..af751cffc2e72be0d688ea1621bc332e00d9793b 100644 (file)
  *  \ingroup gamelogic
  */
 
-
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// This warning tells us about truncation of __long__ stl-generated names.
-// It can occasionally cause DevStudio to have internal compiler warnings.
-#pragma warning( disable : 4786 )     
+#ifdef _MSC_VER
+  /* This warning tells us about truncation of __long__ stl-generated names.
+   * It can occasionally cause DevStudio to have internal compiler warnings. */
+#  pragma warning( disable:4786 )
 #endif
 
 #include <stddef.h>
index f3d02cccf26ce738e637b237a5faf3bb2e268a78..690930196b38b9b8ebeebce21d424e7cd90cfbf7 100644 (file)
@@ -31,8 +31,8 @@
 #ifndef __SCA_LOGICMANAGER_H__
 #define __SCA_LOGICMANAGER_H__
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786)
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
 #endif 
 
 #include <vector>
index a067b9c4d5b500d0919f22bf6570b12f5d698973..6d05b862c2d913f18807401ae2ef281a3ac148a9 100644 (file)
  */
 
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// This warning tells us about truncation of __long__ stl-generated names.
-// It can occasionally cause DevStudio to have internal compiler warnings.
-#pragma warning( disable : 4786 )     
+#ifdef _MSC_VER
+   /* This warning tells us about truncation of __long__ stl-generated names.
+    * It can occasionally cause DevStudio to have internal compiler warnings. */
+#  pragma warning( disable:4786 )
 #endif
 
 #include "BoolValue.h"
index e8a6289a98e8db5ca5402f25476c71b8bfd283a0..5aa6fdc8625399fdc4cc5f3feffaefac44cdd665 100644 (file)
  *  \ingroup gamelogic
  */
 
-
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// This warning tells us about truncation of __long__ stl-generated names.
-// It can occasionally cause DevStudio to have internal compiler warnings.
-#pragma warning( disable : 4786 )     
+#ifdef _MSC_VER
+   /* This warning tells us about truncation of __long__ stl-generated names.
+    * It can occasionally cause DevStudio to have internal compiler warnings. */
+#  pragma warning(disable:4786)
 #endif
 
 #include "SCA_TimeEventManager.h"
index afe7f921a61cecc8bc48ac5d0aae9758b49c0d41..c082bc1b82f03df202a50a0bc338cd16a7862657 100644 (file)
@@ -33,7 +33,7 @@
 #define __GPC_KEYBOARDDEVICE_H__
 
 #ifdef WIN32
-#pragma warning (disable : 4786)
+#pragma warning (disable:4786)
 #endif  /* WIN32 */
 
 #include "SCA_IInputDevice.h"
index 7699a9e3eae6f95929bf050d3d1bb2895ad85010..b092fbd21dd6dd1906c255aac7aff6628b4e568b 100644 (file)
@@ -33,7 +33,7 @@
 #define __GPC_MOUSEDEVICE_H__
 
 #ifdef WIN32
-#pragma warning (disable : 4786)
+#pragma warning (disable:4786)
 #endif  /* WIN32 */
 
 #include "SCA_IInputDevice.h"
index f2d7ec267f3c69f61947f62be82443ee205b3943..440fd2bba27f1bdc5bc1780b504ff91fe4c33bec 100644 (file)
@@ -33,7 +33,7 @@
 #define __GPG_CANVAS_H__
 
 #ifdef WIN32
-#pragma warning (disable : 4786)
+#pragma warning (disable:4786)
 #endif  /* WIN32 */
 
 #include "GPC_Canvas.h"
index 4c6b8205a4294dad989b385d6a447f5e0b5ac36e..ff8d56db40a3a2209c32330e96ca02300c6ca9f0 100644 (file)
@@ -34,7 +34,7 @@
 #define __GPG_KEYBOARDDEVICE_H__
 
 #ifdef WIN32
-#pragma warning (disable : 4786)
+#pragma warning (disable:4786)
 #endif  /* WIN32 */
 
 #include "GHOST_Types.h"
index 776953206fe65d2c106a365406af835e82bfb891..daa74ca14c007a1b9572d2e8427f5bdfd77f64ee 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable : 4786)
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
 #endif
 
 #include "MT_assert.h"
index 3cfb670d227fafd31708f88e25de4835f7fd67e3..dfc8073303e8ec63186fb3ac83c22d46a045aaad 100644 (file)
  *  \ingroup ketsji
  */
 
+#ifdef _MSC_VER
+  /* This warning tells us about truncation of __long__ stl-generated names.
+   * It can occasionally cause DevStudio to have internal compiler warnings. */
+#  pragma warning( disable:4786 )
+#endif
 
 #if defined(_WIN64) && !defined(FREE_WINDOWS64)
 typedef unsigned __int64 uint_ptr;
@@ -37,13 +42,6 @@ typedef unsigned __int64 uint_ptr;
 typedef unsigned long uint_ptr;
 #endif
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// This warning tells us about truncation of __long__ stl-generated names.
-// It can occasionally cause DevStudio to have internal compiler warnings.
-#pragma warning( disable : 4786 )     
-#endif
-
-
 #define KX_INERTIA_INFINITE 10000
 #include "RAS_IPolygonMaterial.h"
 #include "KX_BlenderMaterial.h"
index 52fc3da54653a9e0ed81193870ff6f0496275cbf..157e282b5579a03b6d090804baa3084b5c284187 100644 (file)
@@ -33,9 +33,9 @@
 #ifndef __KX_GAMEOBJECT_H__
 #define __KX_GAMEOBJECT_H__
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// get rid of this stupid "warning 'this' used in initialiser list", generated by VC when including Solid/Sumo
-#pragma warning (disable : 4355) 
+#ifdef _MSC_VER
+   /* get rid of this stupid "warning 'this' used in initialiser list", generated by VC when including Solid/Sumo */
+#  pragma warning (disable:4355)
 #endif 
 
 #include <stddef.h>
@@ -116,11 +116,11 @@ protected:
 
        KX_ObstacleSimulation*                          m_pObstacleSimulation;
 
-       CListValue*                                             m_pInstanceObjects;
+       CListValue*                                                     m_pInstanceObjects;
        KX_GameObject*                                          m_pDupliGroupObject;
 
        // The action manager is used to play/stop/update actions
-       BL_ActionManager*                               m_actionManager;
+       BL_ActionManager*                                       m_actionManager;
 
        BL_ActionManager* GetActionManager();
        
index 950e3c88a9e939f1a1e356de292fe56780c71504..60821fb5aabe9ff0417a000a9234ba2baa188566 100644 (file)
@@ -37,10 +37,10 @@ typedef unsigned __int64 uint_ptr;
 typedef unsigned long uint_ptr;
 #endif
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// This warning tells us about truncation of __long__ stl-generated names.
-// It can occasionally cause DevStudio to have internal compiler warnings.
-#pragma warning( disable : 4786 )     
+#ifdef _MSC_VER
+   /* This warning tells us about truncation of __long__ stl-generated names.
+    * It can occasionally cause DevStudio to have internal compiler warnings. */
+#  pragma warning(disable:4786)
 #endif
 
 #include "KX_IPO_SGController.h"
index e446e5338bc9c13d22e6bfe5cca93b2dbdfe8f40..bf5504f8a2a747b0ef2ec04ee4c221e9fc5c1312 100644 (file)
  *  \ingroup ketsji
  */
 
-
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable : 4786)
-#endif //WIN32
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
+#endif
 
 #include <iostream>
 #include <stdio.h>
index 8b80daa75d397773ab554e081462f40863d6bb85..0e45684d2d056c41eaa464ccdb67c77fddc5ddcc 100644 (file)
@@ -29,8 +29,8 @@
  *  \ingroup ketsji
  */
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable : 4786)
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
 #endif
 
 #include <stdio.h>
@@ -50,9 +50,9 @@
 #include "GPU_material.h"
  
 KX_LightObject::KX_LightObject(void* sgReplicationInfo,SG_Callbacks callbacks,
-                                                          class RAS_IRenderTools* rendertools,
-                                                          const RAS_LightObject&       lightobj,
-                                                          bool glsl)
+                               class RAS_IRenderTools* rendertools,
+                               const RAS_LightObject&  lightobj,
+                               bool glsl)
        : KX_GameObject(sgReplicationInfo,callbacks),
          m_rendertools(rendertools)
 {
index 3251cc4af4679adff767b6a6b0b093d0fe348809..f7dbbe5a86b4d214b49d0f6e396a7b189188004b 100644 (file)
  *  \ingroup ketsji
  */
 
-
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// This warning tells us about truncation of __long__ stl-generated names.
-// It can occasionally cause DevStudio to have internal compiler warnings.
-#pragma warning( disable : 4786 )     
+#ifdef _MSC_VER
+  /* This warning tells us about truncation of __long__ stl-generated names.
+   * It can occasionally cause DevStudio to have internal compiler warnings. */
+#  pragma warning(disable:4786)
 #endif
 
 #include "MT_Point3.h"
 /* ------------------------------------------------------------------------- */
 
 KX_MouseFocusSensor::KX_MouseFocusSensor(SCA_MouseManager* eventmgr, 
-                                                                                int startx,
-                                                                                int starty,
-                                                                                short int mousemode,
-                                                                                int focusmode,
-                                                                                bool bTouchPulse,
-                                                                                KX_Scene* kxscene,
-                                                                                KX_KetsjiEngine *kxengine,
-                                                                                SCA_IObject* gameobj)
+                                         int startx,
+                                         int starty,
+                                         short int mousemode,
+                                         int focusmode,
+                                         bool bTouchPulse,
+                                         KX_Scene* kxscene,
+                                         KX_KetsjiEngine *kxengine,
+                                         SCA_IObject* gameobj)
        : SCA_MouseSensor(eventmgr, startx, starty, mousemode, gameobj),
          m_focusmode(focusmode),
          m_bTouchPulse(bTouchPulse),
index bc324c3b140c927f72d1e60732910fbb758313ca..85303b143bd071ad5ac06c6c6864dc56b218a2aa 100644 (file)
@@ -31,9 +31,9 @@
  */
 
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable : 4786)
-#endif //WIN32
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
+#endif
 
 #ifdef WITH_PYTHON
 
index 43fca40f2daa56fad42c2d0686f024043cb1dcdc..89799d065a4846e5c758119d987d8decb2a85cb7 100644 (file)
  *  \ingroup ketsji
  */
 
-
 #include "GL/glew.h"
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable : 4786)
-#endif //WIN32
-
-#ifdef WITH_PYTHON
-
-#ifdef _POSIX_C_SOURCE
-#undef _POSIX_C_SOURCE
-#endif
-
-#ifdef _XOPEN_SOURCE
-#undef _XOPEN_SOURCE
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
 #endif
 
-#if defined(__sun) || defined(sun) 
-#if defined(_XPG4) 
-#undef _XPG4 
-#endif 
-#endif 
-
-#include <Python.h>
+#ifdef WITH_PYTHON
+#  ifdef   _POSIX_C_SOURCE
+#    undef _POSIX_C_SOURCE
+#  endif
+#  ifdef   _XOPEN_SOURCE
+#    undef _XOPEN_SOURCE
+#  endif
+#  if defined(__sun) || defined(sun)
+#    if defined(_XPG4)
+#      undef _XPG4
+#    endif
+#  endif
+#  include <Python.h>
 
 extern "C" {
-       #include "bpy_internal_import.h"  /* from the blender python api, but we want to import text too! */
-       #include "py_capi_utils.h"
-       #include "mathutils.h" // 'mathutils' module copied here so the blenderlayer can use.
-       #include "bgl.h"
-       #include "blf_py_api.h"
+       #  include "bpy_internal_import.h"  /* from the blender python api, but we want to import text too! */
+       #  include "py_capi_utils.h"
+       #  include "mathutils.h" // 'mathutils' module copied here so the blenderlayer can use.
+       #  include "bgl.h"
+       #  include "blf_py_api.h"
 
-       #include "marshal.h" /* python header for loading/saving dicts */
+       #  include "marshal.h" /* python header for loading/saving dicts */
 }
-
 #include "AUD_PyInit.h"
 
-#endif
+#endif  /* WITH_PYTHON */
 
 #include "KX_PythonInit.h"
 
 // directory header for py function getBlendFileList
 #ifndef WIN32
-  #include <dirent.h>
-  #include <stdlib.h>
+#  include <dirent.h>
+#  include <stdlib.h>
 #else
-  #include <io.h>
-  #include "BLI_winstuff.h"
+#  include <io.h>
+#  include "BLI_winstuff.h"
 #endif
 
 //python physics binding
index f6ab9af261e7ce73d4224babe39189fd19d6fc87..75605fb8fd16bb73ff608fc6f76d9c403d80cf3b 100644 (file)
@@ -31,9 +31,9 @@
  */
 
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable : 4786)
-#endif //WIN32
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
+#endif
 
 #include "KX_Scene.h"
 #include "KX_PythonInit.h"
index d167d0addfe62eda9dd94a2399433606bce6efcd..e097454fca7d74ef5eeb4f002a36a3b0d0b2fea7 100644 (file)
@@ -32,8 +32,8 @@
 #ifndef __KX_TIMECATEGORYLOGGER_H__
 #define __KX_TIMECATEGORYLOGGER_H__
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)  /* suppress stl-MSVC debug info warning */
 #endif
 
 #include <map>
index bafc27b504c32e10b324480b839bae2bd2a73ccc..59d7bdc84e3303bcb7f0e58c67c214f3ef455fa9 100644 (file)
 #ifndef __KX_TIMELOGGER_H__
 #define __KX_TIMELOGGER_H__
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786) // suppress stl-MSVC debug info warning
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)  /* suppress stl-MSVC debug info warning */
 #endif
 
 #include <deque>
 
 #ifdef WITH_CXX_GUARDEDALLOC
-#include "MEM_guardedalloc.h"
+#  include "MEM_guardedalloc.h"
 #endif
 
 /**
index 240bda811f065f249a9a628795860ea193368d63..29a9b6481e9b889861cfd6de7e94846d7e644d13 100644 (file)
@@ -215,8 +215,7 @@ bool CcdPhysicsController::CreateSoftbody()
        btSoftBody* psb  = 0;
        btSoftBodyWorldInfo& worldInfo = m_cci.m_physicsEnv->getDynamicsWorld()->getWorldInfo();
 
-       if (m_cci.m_collisionShape->getShapeType() == CONVEX_HULL_SHAPE_PROXYTYPE)
-       {
+       if (m_cci.m_collisionShape->getShapeType() == CONVEX_HULL_SHAPE_PROXYTYPE) {
                btConvexHullShape* convexHull = (btConvexHullShape* )m_cci.m_collisionShape;
                {
                        int nvertices = convexHull->getNumPoints();
@@ -224,26 +223,25 @@ bool CcdPhysicsController::CreateSoftbody()
 
                        HullDesc                hdsc(QF_TRIANGLES,nvertices,vertices);
                        HullResult              hres;
-                       HullLibrary             hlib;/*??*/ 
+                       HullLibrary             hlib;  /*??*/
                        hdsc.mMaxVertices=nvertices;
                        hlib.CreateConvexHull(hdsc,hres);
                        
-                       psb=new btSoftBody(&worldInfo,(int)hres.mNumOutputVertices,
-                               &hres.m_OutputVertices[0],0);
-                       for (int i=0;i<(int)hres.mNumFaces;++i)
-                       {
-                               const int idx[]={       hres.m_Indices[i*3+0],
-                                       hres.m_Indices[i*3+1],
-                                       hres.m_Indices[i*3+2]};
-                               if (idx[0]<idx[1]) psb->appendLink(     idx[0],idx[1]);
-                               if (idx[1]<idx[2]) psb->appendLink(     idx[1],idx[2]);
-                               if (idx[2]<idx[0]) psb->appendLink(     idx[2],idx[0]);
-                               psb->appendFace(idx[0],idx[1],idx[2]);
+                       psb = new btSoftBody(&worldInfo, (int)hres.mNumOutputVertices,
+                                            &hres.m_OutputVertices[0], 0);
+                       for (int i = 0; i < (int)hres.mNumFaces; ++i) {
+                               const int idx[3] = {hres.m_Indices[i * 3 + 0],
+                                                   hres.m_Indices[i * 3 + 1],
+                                                   hres.m_Indices[i * 3 + 2]};
+                               if (idx[0] < idx[1]) psb->appendLink(idx[0], idx[1]);
+                               if (idx[1] < idx[2]) psb->appendLink(idx[1], idx[2]);
+                               if (idx[2] < idx[0]) psb->appendLink(idx[2], idx[0]);
+                               psb->appendFace(idx[0], idx[1], idx[2]);
                        }
                        hlib.ReleaseResult(hres);
                }
-       } else
-       {
+       }
+       else {
                int numtris = 0;
                if (m_cci.m_collisionShape->getShapeType() ==SCALED_TRIANGLE_MESH_SHAPE_PROXYTYPE)
                {
index 457fd0ad90c4ca4bc137b1439ce1e69746291480..3c49d6e5289c05db5fe9293ebe124d0b9c794e36 100644 (file)
  *  \ingroup bgerast
  */
 
-
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// don't show these anoying STL warnings
-#pragma warning (disable:4786)
+#ifdef _MSC_VER
+   /* don't show these anoying STL warnings */
+#  pragma warning (disable:4786)
 #endif
 
 #include "CTR_Map.h"
index 6042a7dc4b5dc95a5ba1c0a355ed545945356bd9..058f2304f3d258d94d985cda7ef28ecbb43fe2d2 100644 (file)
@@ -32,9 +32,9 @@
 #ifndef __RAS_DEFORMER_H__
 #define __RAS_DEFORMER_H__
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786) // get rid of stupid stl-visual compiler debug warning
-#endif  /* WIN32 */
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)  /* get rid of stupid stl-visual compiler debug warning */
+#endif
 
 #include <stdlib.h>
 #include "CTR_Map.h"
index f212b1e6e0bef10bfdc619c75198dba4da692f56..e69480259994ec92231a5861b5cc29aa4a6a8f94 100644 (file)
@@ -32,8 +32,8 @@
 #ifndef __RAS_IRASTERIZER_H__
 #define __RAS_IRASTERIZER_H__
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786)
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
 #endif
 
 #include "STR_HashedString.h"
index c890f0c3dc5597d1286ecfe1a859c9cc6460ebf3..0cb6bc7439a6da33df9673c68cc30179d66648a6 100644 (file)
@@ -32,8 +32,8 @@
 
 #include "RAS_MaterialBucket.h"
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786)
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
 #endif
 
 #ifdef WIN32
index 99ed59f6057e0e0edc1305c69d98daa068ccb34f..281eae8734af301d78a74930ada36740ece85b2f 100644 (file)
@@ -32,9 +32,9 @@
 #ifndef __RAS_MESHOBJECT_H__
 #define __RAS_MESHOBJECT_H__
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-// disable the STL warnings ("debug information length > 255")
-#pragma warning (disable:4786)
+#ifdef _MSC_VER
+   /* disable the STL warnings ("debug information length > 255") */
+#  pragma warning (disable:4786)
 #endif
 
 #include <vector>
index e6d16378bcfb5446853d9551ea880270d2da4b65..88bb0be531b75faba9f702bb90f711670837dd72 100644 (file)
@@ -32,8 +32,8 @@
 #ifndef __RAS_OPENGLRASTERIZER_H__
 #define __RAS_OPENGLRASTERIZER_H__
 
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786)
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
 #endif
 
 #include "MT_CmMatrix4x4.h"
index a6912c0997db2a8c0cf3caf3b1e2c7251c1076ee..f454d1c020488ef57767e45f5b6b8b240f49a93a 100644 (file)
@@ -29,9 +29,8 @@
  *  \ingroup bgerast
  */
 
-
-#if defined(WIN32) && !defined(FREE_WINDOWS)
-#pragma warning (disable:4786)
+#ifdef _MSC_VER
+#  pragma warning (disable:4786)
 #endif
 
 #include "RAS_Polygon.h"