[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55791] trunk/blender/source/gameengine: code cleanup: bge warnings
Campbell Barton
ideasman42 at gmail.com
Fri Apr 5 01:16:24 CEST 2013
Revision: 55791
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55791
Author: campbellbarton
Date: 2013-04-04 23:16:23 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
code cleanup: bge warnings
Modified Paths:
--------------
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
trunk/blender/source/gameengine/Expressions/ListValue.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp
trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp
trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp
trunk/blender/source/gameengine/VideoTexture/ImageViewport.cpp
trunk/blender/source/gameengine/VideoTexture/Texture.cpp
trunk/blender/source/gameengine/VideoTexture/Texture.h
Modified: trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp 2013-04-04 21:40:39 UTC (rev 55790)
+++ trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp 2013-04-04 23:16:23 UTC (rev 55791)
@@ -182,7 +182,7 @@
return exitrequested;
}
-struct BL_KetsjiNextFrameState {
+static struct BL_KetsjiNextFrameState {
class KX_KetsjiEngine* ketsjiengine;
struct bContext *C;
struct wmWindow* win;
Modified: trunk/blender/source/gameengine/Expressions/ListValue.cpp
===================================================================
--- trunk/blender/source/gameengine/Expressions/ListValue.cpp 2013-04-04 21:40:39 UTC (rev 55790)
+++ trunk/blender/source/gameengine/Expressions/ListValue.cpp 2013-04-04 23:16:23 UTC (rev 55791)
@@ -293,7 +293,7 @@
CValue *cval;
if (list==NULL) {
- PyErr_SetString(PyExc_SystemError, "val = CList[i], "BGE_PROXY_ERROR_MSG);
+ PyErr_SetString(PyExc_SystemError, "val = CList[i], " BGE_PROXY_ERROR_MSG);
return NULL;
}
@@ -350,7 +350,7 @@
{
CListValue *list= static_cast<CListValue *>(BGE_PROXY_REF(self));
if (list==NULL) {
- PyErr_SetString(PyExc_SystemError, "value = CList[i], "BGE_PROXY_ERROR_MSG);
+ PyErr_SetString(PyExc_SystemError, "value = CList[i], " BGE_PROXY_ERROR_MSG);
return NULL;
}
@@ -398,7 +398,7 @@
Py_ssize_t i, numitems, numitems_orig;
if (listval==NULL) {
- PyErr_SetString(PyExc_SystemError, "CList+other, "BGE_PROXY_ERROR_MSG);
+ PyErr_SetString(PyExc_SystemError, "CList+other, " BGE_PROXY_ERROR_MSG);
return NULL;
}
@@ -447,7 +447,7 @@
CListValue* otherval = static_cast<CListValue *>(BGE_PROXY_REF(other));
if (otherval==NULL) {
listval_new->Release();
- PyErr_SetString(PyExc_SystemError, "CList+other, "BGE_PROXY_ERROR_MSG);
+ PyErr_SetString(PyExc_SystemError, "CList+other, " BGE_PROXY_ERROR_MSG);
return NULL;
}
@@ -471,7 +471,7 @@
CListValue *self = static_cast<CListValue *>(BGE_PROXY_REF(self_v));
if (self == NULL) {
- PyErr_SetString(PyExc_SystemError, "val in CList, "BGE_PROXY_ERROR_MSG);
+ PyErr_SetString(PyExc_SystemError, "val in CList, " BGE_PROXY_ERROR_MSG);
return -1;
}
Modified: trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp 2013-04-04 21:40:39 UTC (rev 55790)
+++ trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp 2013-04-04 23:16:23 UTC (rev 55791)
@@ -1572,7 +1572,7 @@
return mathutils_kxgameob_vector_set(bmo, subtype);
}
-Mathutils_Callback mathutils_kxgameob_vector_cb = {
+static Mathutils_Callback mathutils_kxgameob_vector_cb = {
mathutils_kxgameob_generic_check,
mathutils_kxgameob_vector_get,
mathutils_kxgameob_vector_set,
@@ -1628,7 +1628,7 @@
return 0;
}
-Mathutils_Callback mathutils_kxgameob_matrix_cb = {
+static Mathutils_Callback mathutils_kxgameob_matrix_cb = {
mathutils_kxgameob_generic_check,
mathutils_kxgameob_matrix_get,
mathutils_kxgameob_matrix_set,
@@ -1800,7 +1800,7 @@
PyObject *pyconvert;
if (self == NULL) {
- PyErr_SetString(PyExc_SystemError, "val = gameOb[key]: KX_GameObject, "BGE_PROXY_ERROR_MSG);
+ PyErr_SetString(PyExc_SystemError, "val = gameOb[key]: KX_GameObject, " BGE_PROXY_ERROR_MSG);
return NULL;
}
@@ -1834,7 +1834,7 @@
PyErr_Clear();
if (self == NULL) {
- PyErr_SetString(PyExc_SystemError, "gameOb[key] = value: KX_GameObject, "BGE_PROXY_ERROR_MSG);
+ PyErr_SetString(PyExc_SystemError, "gameOb[key] = value: KX_GameObject, " BGE_PROXY_ERROR_MSG);
return -1;
}
@@ -1919,7 +1919,7 @@
KX_GameObject* self = static_cast<KX_GameObject*>BGE_PROXY_REF(self_v);
if (self == NULL) {
- PyErr_SetString(PyExc_SystemError, "val in gameOb: KX_GameObject, "BGE_PROXY_ERROR_MSG);
+ PyErr_SetString(PyExc_SystemError, "val in gameOb: KX_GameObject, " BGE_PROXY_ERROR_MSG);
return -1;
}
Modified: trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp 2013-04-04 21:40:39 UTC (rev 55790)
+++ trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp 2013-04-04 23:16:23 UTC (rev 55791)
@@ -496,7 +496,7 @@
return mathutils_obactu_vector_set(bmo, subtype);
}
-Mathutils_Callback mathutils_obactu_vector_cb = {
+static Mathutils_Callback mathutils_obactu_vector_cb = {
mathutils_obactu_generic_check,
mathutils_obactu_vector_get,
mathutils_obactu_vector_set,
Modified: trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp 2013-04-04 21:40:39 UTC (rev 55790)
+++ trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp 2013-04-04 23:16:23 UTC (rev 55791)
@@ -103,7 +103,7 @@
// stuff for cvalue related things
CValue* KX_PolyProxy::Calc(VALUE_OPERATOR, CValue *) { return NULL;}
CValue* KX_PolyProxy::CalcFinal(VALUE_DATA_TYPE, VALUE_OPERATOR, CValue *) { return NULL;}
-STR_String sPolyName="polygone";
+static STR_String sPolyName = "polygone";
const STR_String & KX_PolyProxy::GetText() {return sPolyName;};
double KX_PolyProxy::GetNumber() { return -1;}
STR_String& KX_PolyProxy::GetName() { return sPolyName;}
Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp 2013-04-04 21:40:39 UTC (rev 55790)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp 2013-04-04 23:16:23 UTC (rev 55791)
@@ -74,7 +74,7 @@
PyObjectPlus *self_plus= BGE_PROXY_REF(((KX_PythonSeq *)self)->base);
if (self_plus==NULL) {
- PyErr_SetString(PyExc_SystemError, "len(seq): "BGE_PROXY_ERROR_MSG);
+ PyErr_SetString(PyExc_SystemError, "len(seq): " BGE_PROXY_ERROR_MSG);
return -1;
}
@@ -105,7 +105,7 @@
PyObjectPlus *self_plus= BGE_PROXY_REF(((KX_PythonSeq *)self)->base);
if (self_plus==NULL) {
- PyErr_SetString(PyExc_SystemError, "val = seq[i]: "BGE_PROXY_ERROR_MSG);
+ PyErr_SetString(PyExc_SystemError, "val = seq[i]: " BGE_PROXY_ERROR_MSG);
return NULL;
}
@@ -269,7 +269,7 @@
PyObjectPlus *self_plus= BGE_PROXY_REF(((KX_PythonSeq *)self)->base);
if (self_plus==NULL) {
- PyErr_SetString(PyExc_SystemError, "val = seq[key], KX_PythonSeq: "BGE_PROXY_ERROR_MSG);
+ PyErr_SetString(PyExc_SystemError, "val = seq[key], KX_PythonSeq: " BGE_PROXY_ERROR_MSG);
return NULL;
}
@@ -299,7 +299,7 @@
PyObjectPlus *self_plus= BGE_PROXY_REF(((KX_PythonSeq *)self)->base);
if (self_plus==NULL) {
- PyErr_SetString(PyExc_SystemError, "key in seq, KX_PythonSeq: "BGE_PROXY_ERROR_MSG);
+ PyErr_SetString(PyExc_SystemError, "key in seq, KX_PythonSeq: " BGE_PROXY_ERROR_MSG);
return -1;
}
if (!PyUnicode_Check(key)) {
@@ -362,7 +362,7 @@
static PyObject *KX_PythonSeq_getIter(KX_PythonSeq *self)
{
if (BGE_PROXY_REF(self->base)==NULL) {
- PyErr_SetString(PyExc_SystemError, "for i in seq: "BGE_PROXY_ERROR_MSG);
+ PyErr_SetString(PyExc_SystemError, "for i in seq: " BGE_PROXY_ERROR_MSG);
return NULL;
}
Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2013-04-04 21:40:39 UTC (rev 55790)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2013-04-04 23:16:23 UTC (rev 55791)
@@ -2064,7 +2064,7 @@
PyObject *pyconvert;
if (self == NULL) {
- PyErr_SetString(PyExc_SystemError, "val = scene[key]: KX_Scene, "BGE_PROXY_ERROR_MSG);
+ PyErr_SetString(PyExc_SystemError, "val = scene[key]: KX_Scene, " BGE_PROXY_ERROR_MSG);
return NULL;
}
@@ -2094,7 +2094,7 @@
PyErr_Clear();
if (self == NULL) {
- PyErr_SetString(PyExc_SystemError, "scene[key] = value: KX_Scene, "BGE_PROXY_ERROR_MSG);
+ PyErr_SetString(PyExc_SystemError, "scene[key] = value: KX_Scene, " BGE_PROXY_ERROR_MSG);
return -1;
}
@@ -2141,7 +2141,7 @@
KX_Scene* self = static_cast<KX_Scene*>BGE_PROXY_REF(self_v);
if (self == NULL) {
- PyErr_SetString(PyExc_SystemError, "val in scene: KX_Scene, "BGE_PROXY_ERROR_MSG);
+ PyErr_SetString(PyExc_SystemError, "val in scene: KX_Scene, " BGE_PROXY_ERROR_MSG);
return -1;
}
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp 2013-04-04 21:40:39 UTC (rev 55790)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp 2013-04-04 23:16:23 UTC (rev 55791)
@@ -24,7 +24,6 @@
* \ingroup bgerast
*/
-
#define STRINGIFY(A) #A
#include "RAS_OpenGLFilters/RAS_Blur2DFilter.h"
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h 2013-04-04 21:40:39 UTC (rev 55790)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h 2013-04-04 23:16:23 UTC (rev 55791)
@@ -32,7 +32,7 @@
#ifndef __RAS_BLUR2DFILTER_H__
#define __RAS_BLUR2DFILTER_H__
-const char * BlurFragmentShader=STRINGIFY(
+static const char *BlurFragmentShader = STRINGIFY(
uniform sampler2D bgl_RenderedTexture;
uniform vec2 bgl_TextureCoordinateOffset[9];
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h 2013-04-04 21:40:39 UTC (rev 55790)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h 2013-04-04 23:16:23 UTC (rev 55791)
@@ -32,7 +32,7 @@
#ifndef __RAS_DILATION2DFILTER_H__
#define __RAS_DILATION2DFILTER_H__
-const char * DilationFragmentShader=STRINGIFY(
+static const char *DilationFragmentShader = STRINGIFY(
uniform sampler2D bgl_RenderedTexture;
uniform vec2 bgl_TextureCoordinateOffset[9];
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list