I think this might be a safer way of dealing with the non-OpenEXR
authorChris Want <cwant@ualberta.ca>
Sun, 24 Dec 2006 20:19:56 +0000 (20:19 +0000)
committerChris Want <cwant@ualberta.ca>
Sun, 24 Dec 2006 20:19:56 +0000 (20:19 +0000)
compilation of image.c -- Ton: please check.

source/blender/blenkernel/intern/image.c

index 735e7c68cf34116f66d944c544c6db77f469e5a3..ac0bc910dbda5769ee9762d87317153401b40cb8 100644 (file)
@@ -1075,6 +1075,7 @@ static ImBuf *image_load_sequence_file(Image *ima, ImageUser *iuser, int frame)
        printf("loaded %s\n", name);
        
        if (ibuf) {
        printf("loaded %s\n", name);
        
        if (ibuf) {
+#ifdef WITH_OPENEXR
                /* handle multilayer case, don't assign ibuf. will be handled in BKE_image_get_ibuf */
                if (ibuf->ftype==OPENEXR && ibuf->userdata) {
                        image_create_multilayer(ima, ibuf, frame);      
                /* handle multilayer case, don't assign ibuf. will be handled in BKE_image_get_ibuf */
                if (ibuf->ftype==OPENEXR && ibuf->userdata) {
                        image_create_multilayer(ima, ibuf, frame);      
@@ -1086,6 +1087,10 @@ static ImBuf *image_load_sequence_file(Image *ima, ImageUser *iuser, int frame)
                        image_assign_ibuf(ima, ibuf, 0, frame);
                        image_initialize_after_load(ima, ibuf);
                }
                        image_assign_ibuf(ima, ibuf, 0, frame);
                        image_initialize_after_load(ima, ibuf);
                }
+#else
+               image_assign_ibuf(ima, ibuf, 0, frame);
+               image_initialize_after_load(ima, ibuf);
+#endif
        }
        else
                ima->ok= 0;
        }
        else
                ima->ok= 0;