diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-04 00:12:21 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-04 00:12:21 +0400 |
| commit | 1a3da5639e945b115711c244de83a1d11a7b8a21 (patch) | |
| tree | 23ed64949d5af322bc99a4bf1ce51e49a60ddbd4 /source/blender/editors | |
| parent | aeea1d394eef4aa8a41f545932cfae66a0487eba (diff) | |
Fix #30064: Image editor: paint on image, rename image, undo -> crash
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_image.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c index a5b79d0c974..b8b36954e22 100644 --- a/source/blender/editors/sculpt_paint/paint_image.c +++ b/source/blender/editors/sculpt_paint/paint_image.c @@ -474,7 +474,6 @@ static void image_undo_restore(bContext *C, ListBase *lb) } 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 @@ static void image_undo_restore(bContext *C, ListBase *lb) 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; |