Commit: e1a345b3fe8f636c799ce449ce3c547949169c5a
Author: Bastien Montagne
Date: Tue Dec 16 14:06:49 2014 +0100
Branches: asset-experiments
https://developer.blender.org/rBe1a345b3fe8f636c799ce449ce3c547949169c5a
Ensure previews are up to date when saving .blend file.
Previuosly, we would only write existing data - and big previews were
nearly never generated by default.
Now, if saving previews is enabled, `wm_file_write()` will ensure
all 'common' previewable datablocks do have up-to-date previews
(brushes remain TODO here for now, they have both a preview **and**
an icon_imbuf, sigh...).
This implied adding an 'immediate' non-job-background version of
`ED_preview_icon_job()`.
Note this does not include objects/groups/etc. It's not simple to generate
previews for those, will probably go for a user-launched py operator here...
Also, cleanup some debug prints!
===================================================================
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/include/ED_render.h
M source/blender/editors/include/UI_interface_icons.h
M source/blender/editors/interface/interface_icons.c
M source/blender/editors/render/render_preview.c
M source/blender/windowmanager/intern/wm_files.c
===================================================================
diff --git a/source/blender/blenloader/intern/writefile.c
b/source/blender/blenloader/intern/writefile.c
index e464573..286bc85 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -596,9 +596,6 @@ static void write_previews(WriteData *wd, PreviewImage *prv)
short h = prv->h[1];
unsigned int *rect = prv->rect[1];
- printf("\t\tsmall: %p (%d x %d)\n", prv->rect[0], prv->w[0],
prv->h[0]);
- printf("\t\t big: %p (%d x %d)\n", prv->rect[1], prv->w[1],
prv->h[1]);
-
/* don't write out large previews if not requested */
if (!(U.flag & USER_SAVE_PREVIEWS)) {
prv->w[1] = 0;
@@ -1685,7 +1682,6 @@ static void write_objects(WriteData *wd, ListBase *idbase)
writelist(wd, DATA, "LodLevel", &ob->lodlevels);
}
- printf("write_previews: %s\n", ob->id.name);
write_previews(wd, ob->preview);
ob= ob->id.next;
@@ -2108,7 +2104,6 @@ static void write_images(WriteData *wd, ListBase *idbase)
writedata(wd, DATA, pf->size, pf->data);
}
- printf("write_previews: %s\n", ima->id.name);
write_previews(wd, ima->preview);
}
ima= ima->id.next;
@@ -2147,7 +2142,6 @@ static void write_textures(WriteData *wd, ListBase
*idbase)
write_nodetree(wd, tex->nodetree);
}
- printf("write_previews: %s\n", tex->id.name);
write_previews(wd, tex->preview);
}
tex= tex->id.next;
@@ -2189,7 +2183,6 @@ static void write_materials(WriteData *wd, ListBase
*idbase)
write_nodetree(wd, ma->nodetree);
}
- printf("write_previews: %s\n", ma->id.name);
write_previews(wd, ma->preview);
}
ma= ma->id.next;
@@ -2220,7 +2213,6 @@ static void write_worlds(WriteData *wd, ListBase *idbase)
write_nodetree(wd, wrld->nodetree);
}
- printf("write_previews: %s\n", wrld->id.name);
write_previews(wd, wrld->preview);
}
wrld= wrld->id.next;
@@ -2255,7 +2247,6 @@ static void write_lamps(WriteData *wd, ListBase *idbase)
write_nodetree(wd, la->nodetree);
}
- printf("write_previews: %s\n", la->id.name);
write_previews(wd, la->preview);
}
@@ -2947,7 +2938,6 @@ static void write_groups(WriteData *wd, ListBase *idbase)
writestruct(wd, ID_GR, "Group", 1, group);
if (group->id.properties)
IDP_WriteProperty(group->id.properties, wd);
- printf("write_previews: %s\n", group->id.name);
write_previews(wd, group->preview);
go= group->gobject.first;
@@ -3056,7 +3046,6 @@ static void write_brushes(WriteData *wd, ListBase *idbase)
if (brush->curve)
writestruct(wd, DATA, "ColorBand", 1,
brush->gradient);
- printf("write_previews: %s\n", brush->id.name);
write_previews(wd, brush->preview);
}
}
diff --git a/source/blender/editors/include/ED_render.h
b/source/blender/editors/include/ED_render.h
index 0227ae3..32fa641 100644
--- a/source/blender/editors/include/ED_render.h
+++ b/source/blender/editors/include/ED_render.h
@@ -72,6 +72,7 @@ void ED_preview_init_dbase(void);
void ED_preview_free_dbase(void);
void ED_preview_shader_job(const struct bContext *C, void *owner, struct ID
*id, struct ID *parent, struct MTex *slot, int sizex, int sizey, int method);
+void ED_preview_icon_render(const struct bContext *C, void *owner, struct ID
*id, unsigned int *rect, int sizex, int sizey);
void ED_preview_icon_job(const struct bContext *C, void *owner, struct ID *id,
unsigned int *rect, int sizex, int sizey);
void ED_preview_kill_jobs(struct wmWindowManager *wm, struct Main *bmain);
diff --git a/source/blender/editors/include/UI_interface_icons.h
b/source/blender/editors/include/UI_interface_icons.h
index 16221db..e6dd91c 100644
--- a/source/blender/editors/include/UI_interface_icons.h
+++ b/source/blender/editors/include/UI_interface_icons.h
@@ -66,7 +66,7 @@ void UI_icons_init(int first_dyn_id);
int UI_icon_get_width(int icon_id);
int UI_icon_get_height(int icon_id);
-void UI_id_icon_render(struct bContext *C, struct ID *id, const bool big);
+void UI_id_icon_render(struct bContext *C, struct ID *id, const bool big,
const bool wait);
void UI_icon_draw(float x, float y, int icon_id);
void UI_icon_draw_preview(float x, float y, int icon_id);
diff --git a/source/blender/editors/interface/interface_icons.c
b/source/blender/editors/interface/interface_icons.c
index f2d50a1..c8e884d 100644
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@ -931,7 +931,7 @@ static void icon_create_rect(struct PreviewImage *prv_img,
enum eIconSizes size)
/* only called when icon has changed */
/* only call with valid pointer from UI_icon_draw */
-static void icon_set_image(bContext *C, ID *id, PreviewImage *prv_img, enum
eIconSizes size)
+static void icon_set_image(bContext *C, ID *id, PreviewImage *prv_img, enum
eIconSizes size, const bool wait)
{
if (!prv_img) {
if (G.debug & G_DEBUG)
@@ -941,8 +941,14 @@ static void icon_set_image(bContext *C, ID *id,
PreviewImage *prv_img, enum eIco
icon_create_rect(prv_img, size);
- ED_preview_icon_job(C, prv_img, id, prv_img->rect[size],
- prv_img->w[size], prv_img->h[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 {
+ /* Job (background) version */
+ ED_preview_icon_job(C, prv_img, id, prv_img->rect[size],
prv_img->w[size], prv_img->h[size]);
+ }
}
PreviewImage *UI_icon_to_preview(int icon_id)
@@ -1213,28 +1219,26 @@ static void icon_draw_size(float x, float y, int
icon_id, float aspect, float al
}
}
-static void ui_id_preview_image_render_size(bContext *C, ID *id, PreviewImage
*pi, int size)
+static void ui_id_preview_image_render_size(bContext *C, ID *id, PreviewImage
*pi, int size, const bool wait)
{
if ((pi->changed[size] || !pi->rect[size])) { /* changed only ever set
by dynamic icons */
/* create the rect if necessary */
- printf("%s: %s\n", __func__, id->name);
-
- icon_set_image(C, id, pi, size);
+ icon_set_image(C, id, pi, size, wait);
pi->changed[size] = 0;
}
}
-void UI_id_icon_render(bContext *C, ID *id, const bool big)
+void UI_id_icon_render(bContext *C, ID *id, const bool big, const bool wait)
{
PreviewImage *pi = BKE_previewimg_get(id);
if (pi) {
if (big)
- ui_id_preview_image_render_size(C, id, pi,
ICON_SIZE_PREVIEW); /* bigger preview size */
+ ui_id_preview_image_render_size(C, id, pi,
ICON_SIZE_PREVIEW, wait); /* bigger preview size */
else
- ui_id_preview_image_render_size(C, id, pi,
ICON_SIZE_ICON); /* icon size */
+ ui_id_preview_image_render_size(C, id, pi,
ICON_SIZE_ICON, wait); /* icon size */
}
}
@@ -1251,9 +1255,7 @@ static void ui_id_brush_render(bContext *C, ID *id)
* only set by dynamic icons */
if ((pi->changed[i] || !pi->rect[i])) {
- printf("%s: %s\n", __func__, id->name);
-
- icon_set_image(C, id, pi, i);
+ icon_set_image(C, id, pi, i, false);
pi->changed[i] = 0;
}
}
@@ -1329,7 +1331,7 @@ int ui_id_icon_get(bContext *C, ID *id, const bool big)
case ID_LA: /* fall through */
iconid = BKE_icon_getid(id);
/* checks if not exists, or changed */
- UI_id_icon_render(C, id, big);
+ UI_id_icon_render(C, id, big, false);
break;
default:
break;
diff --git a/source/blender/editors/render/render_preview.c
b/source/blender/editors/render/render_preview.c
index b36e4e2..c2c2d32 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -46,6 +46,7 @@
#include "BLI_math.h"
#include "BLI_blenlib.h"
#include "BLI_utildefines.h"
+#include "PIL_time.h"
#include "BLO_readfile.h"
@@ -927,7 +928,7 @@ static void icon_preview_startjob(void *customdata, short
*stop, short *do_updat
ShaderPreview *sp = customdata;
ID *id = sp->id;
short idtype = GS(id->name);
-
+
if (idtype == ID_IM) {
Image *ima = (Image *)id;
ImBuf *ibuf = NULL;
@@ -1098,11 +1099,31 @@ static void icon_preview_free(void *customdata)
MEM_freeN(ip);
}
+void ED_preview_icon_render(const bContext *C, void *UNUSED(owner), ID *id,
unsigned int *rect, int sizex, int sizey)
+{
+ IconPreview ip = {0};
+ short stop = false, update = false;
+ float progress = 0.0f;
+
+ /* customdata for preview thread */
+ ip.scene = CTX_data_scene(C);
+ ip.owner = id;
+ ip.id = id;
+
+ icon_preview_add_size(&ip, rect, sizex, sizey);
+
+ icon_preview_startjob_all_sizes(&ip, &stop, &update, &progress);
+
+ icon_preview_endjob(&ip);
+
+ BLI_freelistN(&ip.sizes);
+}
+
void ED_preview_icon_job(const bContext *C, void *owner, ID *id, unsigned int
*rect, int sizex, int sizey)
{
wmJob *wm_job;
IconPreview *ip, *old_ip;
-
+
/* suspended start means it starts after 1 timer step, see
WM_jobs_timer below */
wm_job = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), owner, "Icon
Preview",
WM_JOB_EXCL_RENDER | WM_JOB_SUSPEND,
WM_JOB_TYPE_RENDER_PREVIEW);
diff --git a/source/blender/windowmanager/intern/wm_files.c
b/source/blender/windowmanager/intern/wm_files.c
index c1c31f6..82a64db 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -62,6 +62,7 @@
#include "BLF_translation.h"
+#include "DNA_ID.h"
#include "DNA_object_types.h"
#include "DNA_space_types.h"
#include "DNA_userdef_types.h"
@@ -101,6 +102,7 @@
#include "GHOST_Path-api.h"
#include "UI_interface.h"
+#include "UI_interface_icons.h"
#include "UI_view2d.h"
#include "GPU_draw.h"
@@ -894,6 +896,37 @@ bool write_crash_blend(void)
}
}
+static void wm_ensure_previews(bContext *C, Main *mainvar)
+{
+ ID *id;
+
+ for (id = mainvar->mat.first; id; id = id->next) {
+ UI_id_icon_render(C, id, false, false);
+ UI_id_icon_render(C, id, true, true);
+ }
+
+ for (id = mainvar->tex.first; id; id = id->next) {
+ UI_id_icon_render(C, id, false, false);
+ UI_id_icon_render(C, id, true, true);
+ }
+
+ for (id = mainvar->image.first; id; id = id->next) {
+ UI_id_icon_render(C, id, false, false);
+ UI_id_icon_render(C, id, true, true);
+ }
+
+ for (id = mainvar->world.first; id; id = id->next) {
+ UI_id_icon_render(C, id, false, false);
+ UI_id_icon_rend
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
