[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43874] trunk/blender/source/blender/ editors/sculpt_paint/paint_image.c: Fix #30064: Image editor: paint on image, rename image, undo -> crash

Sergey Sharybin sergey.vfx at gmail.com
Fri Feb 3 21:12:28 CET 2012


Revision: 43874
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43874
Author:   nazgul
Date:     2012-02-03 20:12:21 +0000 (Fri, 03 Feb 2012)
Log Message:
-----------
Fix #30064: Image editor: paint on image, rename image, undo -> crash

Modified Paths:
--------------
    trunk/blender/source/blender/editors/sculpt_paint/paint_image.c

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c	2012-02-03 19:13:31 UTC (rev 43873)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c	2012-02-03 20:12:21 UTC (rev 43874)
@@ -474,7 +474,6 @@
 		}
 
 		ibuf= BKE_image_get_ibuf(ima, NULL);
-		use_float = ibuf->rect_float ? 1 : 0;
 
 		if(ima && ibuf && strcmp(tile->ibufname, ibuf->name)!=0) {
 			/* current ImBuf filename was changed, probably current frame
@@ -491,6 +490,8 @@
 		if (ima->gen_type != tile->gen_type || ima->source != tile->source)
 			continue;
 
+		use_float = ibuf->rect_float ? 1 : 0;
+
 		if (use_float != tile->use_float)
 			continue;
 




More information about the Bf-blender-cvs mailing list