diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-10 13:38:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-10 13:38:38 +0400 |
| commit | 357febc168cb13981f277b32f1ea2e3488b05b99 (patch) | |
| tree | 84cc46ed9754929e577e1b59c715297a7c1d59ff /source/gameengine | |
| parent | 8ed1c07a7b21d916f149dfa00649579165c45979 (diff) | |
fix for building with collada and some other warnings
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Expressions/IfExpr.h | 2 | ||||
| -rw-r--r-- | source/gameengine/Ketsji/KX_NavMeshObject.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/VideoTexture/blendVideoTex.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/gameengine/Expressions/IfExpr.h b/source/gameengine/Expressions/IfExpr.h index 5ac8d835afd..e67134c2271 100644 --- a/source/gameengine/Expressions/IfExpr.h +++ b/source/gameengine/Expressions/IfExpr.h @@ -20,7 +20,7 @@ #if !defined(AFX_IFEXPR_H__1F691841_C5C7_11D1_A863_0000B4542BD8__INCLUDED_) #define AFX_IFEXPR_H__1F691841_C5C7_11D1_A863_0000B4542BD8__INCLUDED_ -#if _MSC_VER >= 1000 +#if defined(_MSC_VER) && _MSC_VER >= 1000 #pragma once #endif // _MSC_VER >= 1000 diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.cpp b/source/gameengine/Ketsji/KX_NavMeshObject.cpp index 293fc6eaa08..9fd87b03d29 100644 --- a/source/gameengine/Ketsji/KX_NavMeshObject.cpp +++ b/source/gameengine/Ketsji/KX_NavMeshObject.cpp @@ -237,7 +237,7 @@ bool KX_NavMeshObject::BuildVertIndArrays(float *&vertices, int& nverts, copy_v3_v3(vert, pos); else { - memset(vert, NULL, 3*sizeof(float)); //vertex isn't in any poly, set dummy zero coordinates + memset(vert, 0, 3*sizeof(float)); //vertex isn't in any poly, set dummy zero coordinates } vert+=3; } diff --git a/source/gameengine/VideoTexture/blendVideoTex.cpp b/source/gameengine/VideoTexture/blendVideoTex.cpp index 2cb3831de52..e7244265fc4 100644 --- a/source/gameengine/VideoTexture/blendVideoTex.cpp +++ b/source/gameengine/VideoTexture/blendVideoTex.cpp @@ -112,7 +112,7 @@ static PyMethodDef moduleMethods[] = {NULL} /* Sentinel */ }; -#if WITH_FFMPEG +#ifdef WITH_FFMPEG extern PyTypeObject VideoFFmpegType; extern PyTypeObject ImageFFmpegType; #endif @@ -134,7 +134,7 @@ extern PyTypeObject ImageViewportType; static void registerAllTypes(void) { -#if WITH_FFMPEG +#ifdef WITH_FFMPEG pyImageTypes.add(&VideoFFmpegType, "VideoFFmpeg"); pyImageTypes.add(&ImageFFmpegType, "ImageFFmpeg"); #endif |