kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
Campbell Barton 2013-04-05 00:10:33 +00:00
parent 54363910bc
commit dee2f0c9ac
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/imbuf/intern/thumbs.c
View File

@ -285,8 +285,8 @@ ImBuf *IMB_thumb_create(const char *path, ThumbSize size, ThumbSource source, Im
/* exception, skip images over 100mb */
if (source == THB_SOURCE_IMAGE) {
const size_t size = BLI_file_size(path);
if (size != -1 && size > THUMB_SIZE_MAX) {
const size_t file_size = BLI_file_size(path);
if (file_size != -1 && file_size > THUMB_SIZE_MAX) {
// printf("file too big: %d, skipping %s\n", (int)size, path);
return NULL;
}

4
source/gameengine/VideoTexture/ImageRender.cpp
View File

@ -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*/

2
source/gameengine/VideoTexture/ImageViewport.cpp
View File

@ -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*/

7
source/gameengine/VideoTexture/VideoBase.h
View File

@ -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__ */

5
source/gameengine/VideoTexture/blendVideoTex.cpp
View File

@ -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)
{