Commit: e53cdbf62f785691f800ed275b34e9678ba853ee
Author: Bastien Montagne
Date: Wed Jan 7 12:44:45 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rBe53cdbf62f785691f800ed275b34e9678ba853ee
Merge branch 'master' into asset-experiments
Conflicts:
source/blender/editors/include/UI_interface_icons.h
source/blender/editors/interface/interface_icons.c
source/blender/windowmanager/intern/wm_files.c
===================================================================
===================================================================
diff --cc source/blender/editors/interface/interface_icons.c
index 95c7f0c,bebc515..df1a63d
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@@ -939,18 -939,9 +939,14 @@@ static void icon_set_image(const bConte
return;
}
+ if (prv_img->user_edited[size]) {
+ /* user-edited preview, do not auto-update! */
+ return;
+ }
+
icon_create_rect(prv_img, size);
- if (wait) {
- /* Immediate version */
- ED_preview_icon_render(C, prv_img, id, prv_img->rect[size],
prv_img->w[size], prv_img->h[size]);
- }
- else {
+ if (use_job) {
/* Job (background) version */
ED_preview_icon_job(C, prv_img, id, prv_img->rect[size],
prv_img->w[size], prv_img->h[size]);
}
@@@ -1258,7 -1189,7 +1258,7 @@@ static void ui_id_brush_render(const bC
/* check if rect needs to be created; changed
* only set by dynamic icons */
if ((pi->changed[i] || !pi->rect[i])) {
-- icon_set_image(C, id, pi, i, false);
++ icon_set_image(C, id, pi, i, true);
pi->changed[i] = 0;
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
