griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix glitch where vertex baking wouldn't always refresh the mesh.

Browse Source
This commit is contained in:
Campbell Barton
2013-04-24 13:12:29 +00:00
parent d2daa230d6
commit 2439bf0d9b
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/render/intern/source/bake.c
View File

@@ -53,6 +53,7 @@
#include "BKE_main.h"
#include "BKE_node.h"
#include "BKE_scene.h"
#include "BKE_library.h"
#include "IMB_imbuf_types.h"
#include "IMB_imbuf.h"
@@ -641,7 +642,7 @@ static int get_next_bake_face(BakeShade *bs)
bs->mloop = me->mloop + bs->mpoly->loopstart;
/* Tag mesh for reevaluation. */
DAG_id_tag_update(&me->id, 0);
me->id.flag |= LIB_DOIT;
}
else {
Image *ima = NULL;
@@ -1000,6 +1001,11 @@ int RE_bake_shade_all_selected(Render *re, int type, Object *actob, short *do_up
}
}
if (R.r.bake_flag & R_BAKE_VCOL) {
/* untag all meshes */
tag_main_lb(&G.main->mesh, false);
}
BLI_init_threads(&threads, do_bake_thread, re->r.threads);
handles = MEM_callocN(sizeof(BakeShade) * re->r.threads, "BakeShade");
@@ -1099,6 +1105,19 @@ int RE_bake_shade_all_selected(Render *re, int type, Object *actob, short *do_up
}
}
if (R.r.bake_flag & R_BAKE_VCOL) {
/* update all tagged meshes */
Object *ob;
for (ob = G.main->object.first; ob; ob = ob->id.next) {
if (ob->type == OB_MESH) {
Mesh *me = ob->data;
if (me->id.flag & LIB_DOIT) {
DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA);
}
}
}
}
MEM_freeN(handles);
BLI_end_threads(&threads);