forked from bartvdbraak/blender
correction to previous warning cleanup, also quiet shadow-warning for thumbnail size
This commit is contained in:
parent
54363910bc
commit
dee2f0c9ac
@ -285,8 +285,8 @@ ImBuf *IMB_thumb_create(const char *path, ThumbSize size, ThumbSource source, Im
|
|||||||
|
|
||||||
/* exception, skip images over 100mb */
|
/* exception, skip images over 100mb */
|
||||||
if (source == THB_SOURCE_IMAGE) {
|
if (source == THB_SOURCE_IMAGE) {
|
||||||
const size_t size = BLI_file_size(path);
|
const size_t file_size = BLI_file_size(path);
|
||||||
if (size != -1 && size > THUMB_SIZE_MAX) {
|
if (file_size != -1 && file_size > THUMB_SIZE_MAX) {
|
||||||
// printf("file too big: %d, skipping %s\n", (int)size, path);
|
// printf("file too big: %d, skipping %s\n", (int)size, path);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -398,7 +398,7 @@ static PyGetSetDef imageRenderGetSets[] =
|
|||||||
|
|
||||||
|
|
||||||
// define python type
|
// define python type
|
||||||
static PyTypeObject ImageRenderType = {
|
PyTypeObject ImageRenderType = {
|
||||||
PyVarObject_HEAD_INIT(NULL, 0)
|
PyVarObject_HEAD_INIT(NULL, 0)
|
||||||
"VideoTexture.ImageRender", /*tp_name*/
|
"VideoTexture.ImageRender", /*tp_name*/
|
||||||
sizeof(PyImage), /*tp_basicsize*/
|
sizeof(PyImage), /*tp_basicsize*/
|
||||||
@ -732,7 +732,7 @@ ImageRender::ImageRender (KX_Scene *scene, KX_GameObject *observer, KX_GameObjec
|
|||||||
|
|
||||||
|
|
||||||
// define python type
|
// define python type
|
||||||
static PyTypeObject ImageMirrorType = {
|
PyTypeObject ImageMirrorType = {
|
||||||
PyVarObject_HEAD_INIT(NULL, 0)
|
PyVarObject_HEAD_INIT(NULL, 0)
|
||||||
"VideoTexture.ImageMirror", /*tp_name*/
|
"VideoTexture.ImageMirror", /*tp_name*/
|
||||||
sizeof(PyImage), /*tp_basicsize*/
|
sizeof(PyImage), /*tp_basicsize*/
|
||||||
|
@ -358,7 +358,7 @@ static PyGetSetDef imageViewportGetSets[] =
|
|||||||
|
|
||||||
|
|
||||||
// define python type
|
// define python type
|
||||||
static PyTypeObject ImageViewportType = {
|
PyTypeObject ImageViewportType = {
|
||||||
PyVarObject_HEAD_INIT(NULL, 0)
|
PyVarObject_HEAD_INIT(NULL, 0)
|
||||||
"VideoTexture.ImageViewport", /*tp_name*/
|
"VideoTexture.ImageViewport", /*tp_name*/
|
||||||
sizeof(PyImage), /*tp_basicsize*/
|
sizeof(PyImage), /*tp_basicsize*/
|
||||||
|
@ -199,6 +199,9 @@ int Video_setRepeat(PyImage *self, PyObject *value, void *closure);
|
|||||||
PyObject *Video_getFrameRate(PyImage *self, void *closure);
|
PyObject *Video_getFrameRate(PyImage *self, void *closure);
|
||||||
int Video_setFrameRate(PyImage *self, PyObject *value, 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__ */
|
||||||
|
|
||||||
|
@ -134,11 +134,6 @@ extern PyTypeObject FilterRGBA32Type;
|
|||||||
extern PyTypeObject FilterBGR24Type;
|
extern PyTypeObject FilterBGR24Type;
|
||||||
extern PyTypeObject ImageBuffType;
|
extern PyTypeObject ImageBuffType;
|
||||||
extern PyTypeObject ImageMixType;
|
extern PyTypeObject ImageMixType;
|
||||||
extern PyTypeObject ImageRenderType;
|
|
||||||
extern PyTypeObject ImageMirrorType;
|
|
||||||
extern PyTypeObject ImageViewportType;
|
|
||||||
extern PyTypeObject ImageViewportType;
|
|
||||||
|
|
||||||
|
|
||||||
static void registerAllTypes(void)
|
static void registerAllTypes(void)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user