[Bf-blender-cvs] [a6a8cb8] multiview: Compositor: fix issue when selecting individual view for non-matching image filepaths since the first image

[Dalai Felinto]

Commit: a6a8cb846a00d33f7429ef4281e65817d1ec03c4
Author: Dalai Felinto
Date:   Mon Mar 16 16:41:51 2015 +0100
Branches: multiview
https://developer.blender.org/rBa6a8cb846a00d33f7429ef4281e65817d1ec03c4

Compositor: fix issue when selecting individual view for non-matching image 
filepaths since the first image

===================================================================

M       source/blender/blenkernel/intern/image.c

===================================================================

diff --git a/source/blender/blenkernel/intern/image.c 
b/source/blender/blenkernel/intern/image.c
index 093d3e2..941d630 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -4481,8 +4481,6 @@ static void image_update_views_format(Image *ima, 
ImageUser *iuser)
                for (i = 0; i < 2; i++) {
                        image_add_view(ima, names[i], ima->name);
                }
-
-               ima->views_format = R_IMF_VIEWS_STEREO_3D;
                return;
        }
        else {
@@ -4507,7 +4505,8 @@ static void image_update_views_format(Image *ima, 
ImageUser *iuser)
                }
 
                /* check if the files are all available */
-               for (iv = ima->views.first; iv; iv = iv->next) {
+               iv = ima->views.last;
+               while (iv) {
                        int file;
                        char str[FILE_MAX];
 
@@ -4518,10 +4517,13 @@ static void image_update_views_format(Image *ima, 
ImageUser *iuser)
                        file = BLI_open(str, O_BINARY | O_RDONLY, 0);
                        if (file == -1) {
                                ImageView *iv_del = iv;
-                               iv = iv_del->prev;
+                               iv = iv->prev;
                                BLI_remlink(&ima->views, iv_del);
                                MEM_freeN(iv_del);
                        }
+                       else {
+                               iv = iv->prev;
+                       }
                        close(file);
                }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs