Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/render/render_preview.c')
-rw-r--r--source/blender/editors/render/render_preview.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index ae2462b95f8..8f0c10c0b30 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -69,6 +69,7 @@
#include "BKE_world.h"
#include "BKE_texture.h"
#include "BKE_utildefines.h"
+#include "BKE_brush.h"
#include "IMB_imbuf.h"
#include "IMB_imbuf_types.h"
@@ -1069,6 +1070,19 @@ static void icon_preview_startjob(void *customdata, short *stop, short *do_updat
*do_update= 1;
}
+ else if(idtype == ID_BR) {
+ Brush *br= (Brush*)id;
+
+ br->icon_imbuf= get_brush_icon(br);
+
+ if(!(br->icon_imbuf) || !(br->icon_imbuf->rect))
+ return;
+
+ memset(sp->pr_rect, 0x888888, sp->sizex*sp->sizey*sizeof(unsigned int));
+ icon_copy_rect(br->icon_imbuf, sp->sizex, sp->sizey, sp->pr_rect);
+
+ *do_update= 1;
+ }
else {
/* re-use shader job */
shader_preview_startjob(customdata, stop, do_update);