[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30584] trunk/blender/source/blender/ editors/space_image/image_ops.c: Fix #22870: Can' t save modified non-packed images.

[Brecht Van Lommel]

Revision: 30584
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30584
Author:   blendix
Date:     2010-07-21 16:09:45 +0200 (Wed, 21 Jul 2010)

Log Message:
-----------
Fix #22870: Can't save modified non-packed images. File exist check
wasn't taking into account that there could be relative paths.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_image/image_ops.c

Modified: trunk/blender/source/blender/editors/space_image/image_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_ops.c        
2010-07-21 14:08:55 UTC (rev 30583)
+++ trunk/blender/source/blender/editors/space_image/image_ops.c        
2010-07-21 14:09:45 UTC (rev 30584)
@@ -127,10 +127,15 @@
                SpaceImage *sima= CTX_wm_space_image(C);
                ImBuf *ibuf;
                void *lock;
-               int poll;
-               
+               int poll= 0;
+               char name[FILE_MAX];
+
                ibuf= ED_space_image_acquire_buffer(sima, &lock);
-               poll= (ibuf && BLI_exists(ibuf->name) && 
BLI_is_writable(ibuf->name));
+               if(ibuf) {
+                       BLI_strncpy(name, ibuf->name, FILE_MAX);
+                       BLI_path_abs(name, G.sce);
+                       poll= (BLI_exists(name) && BLI_is_writable(name));
+               }
                ED_space_image_release_buffer(sima, lock);
 
                return poll;
@@ -1030,6 +1035,8 @@
        BLI_strncpy(name, ibuf->name, FILE_MAX);
        if(name[0]==0)
                BLI_strncpy(name, G.ima, FILE_MAX);
+       else
+               BLI_path_abs(name, G.sce);
        
        if(BLI_exists(name) && BLI_is_writable(name)) {
                rr= BKE_image_acquire_renderresult(scene, ima);


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