correction to previous warning cleanup, also quiet shadow-warning for thumbnail `size`

4 files changed, 8 insertions, 10 deletions

diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp
index c5938b59e3e..d251f4f7bcb 100644
--- a/source/gameengine/VideoTexture/ImageRender.cpp
+++ b/source/gameengine/VideoTexture/ImageRender.cpp
@@ -398,7 +398,7 @@ static PyGetSetDef imageRenderGetSets[] =
 
 
 // define python type
-static PyTypeObject ImageRenderType = {
+PyTypeObject ImageRenderType = {
 	PyVarObject_HEAD_INIT(NULL, 0)
 	"VideoTexture.ImageRender",   /*tp_name*/
 	sizeof(PyImage),          /*tp_basicsize*/
@@ -732,7 +732,7 @@ ImageRender::ImageRender (KX_Scene *scene, KX_GameObject *observer, KX_GameObjec
 
 
 // define python type
-static PyTypeObject ImageMirrorType = {
+PyTypeObject ImageMirrorType = {
 	PyVarObject_HEAD_INIT(NULL, 0)
 	"VideoTexture.ImageMirror",   /*tp_name*/
 	sizeof(PyImage),          /*tp_basicsize*/
diff --git a/source/gameengine/VideoTexture/ImageViewport.cpp b/source/gameengine/VideoTexture/ImageViewport.cpp
index 480a592930a..18095ea631d 100644
--- a/source/gameengine/VideoTexture/ImageViewport.cpp
+++ b/source/gameengine/VideoTexture/ImageViewport.cpp
@@ -358,7 +358,7 @@ static PyGetSetDef imageViewportGetSets[] =
 
 
 // define python type
-static PyTypeObject ImageViewportType = {
+PyTypeObject ImageViewportType = {
 	PyVarObject_HEAD_INIT(NULL, 0)
 	"VideoTexture.ImageViewport",   /*tp_name*/
 	sizeof(PyImage),          /*tp_basicsize*/
diff --git a/source/gameengine/VideoTexture/VideoBase.h b/source/gameengine/VideoTexture/VideoBase.h
index 8d64980c9c2..51f025909fd 100644
--- a/source/gameengine/VideoTexture/VideoBase.h
+++ b/source/gameengine/VideoTexture/VideoBase.h
@@ -199,6 +199,9 @@ int       Video_setRepeat(PyImage *self, PyObject *value, void *closure);
 PyObject *Video_getFrameRate(PyImage *self, void *closure);
 int       Video_setFrameRate(PyImage *self, PyObject *value, void *closure);
 
+/* py api */
+extern PyTypeObject ImageRenderType;
+extern PyTypeObject ImageMirrorType;
+extern PyTypeObject ImageViewportType;
 
-#endif
-
+#endif  /* __VIDEOBASE_H__ */
diff --git a/source/gameengine/VideoTexture/blendVideoTex.cpp b/source/gameengine/VideoTexture/blendVideoTex.cpp
index e23bd1a3231..ab6dca0958f 100644
--- a/source/gameengine/VideoTexture/blendVideoTex.cpp
+++ b/source/gameengine/VideoTexture/blendVideoTex.cpp
@@ -134,11 +134,6 @@ extern PyTypeObject FilterRGBA32Type;
 extern PyTypeObject FilterBGR24Type;
 extern PyTypeObject ImageBuffType;
 extern PyTypeObject ImageMixType;
-extern PyTypeObject ImageRenderType;
-extern PyTypeObject ImageMirrorType;
-extern PyTypeObject ImageViewportType;
-extern PyTypeObject ImageViewportType;
-
 
 static void registerAllTypes(void)
 {