diff options
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/editors/object/object_bake.c | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ba270d732fc..40bf4d80c3c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -420,8 +420,8 @@ if(NOT WITH_BOOST) macro(set_and_warn _setting _val) if(${${_setting}}) - message(STATUS "'WITH_BOOST' is disabled: forceing 'set(${_setting} ${_val})'") - endif() + message(STATUS "'WITH_BOOST' is disabled: forceing 'set(${_setting} ${_val})'") + endif() set(${_setting} ${_val}) endmacro() diff --git a/source/blender/editors/object/object_bake.c b/source/blender/editors/object/object_bake.c index 426f543c045..01e614fef41 100644 --- a/source/blender/editors/object/object_bake.c +++ b/source/blender/editors/object/object_bake.c @@ -648,15 +648,12 @@ static void finish_bake_internal(BakeRender *bkr) if (bkr->scene->r.bake_flag & R_BAKE_VCOL) { /* update all tagged meshes */ - Object *ob; + Mesh *me; BLI_assert(BLI_thread_is_main()); - 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); - BKE_mesh_tessface_clear(me); - } + for (me = G.main->mesh.first; me; me = me->id.next) { + if (me->id.flag & LIB_DOIT) { + DAG_id_tag_update(&me->id, OB_RECALC_DATA); + BKE_mesh_tessface_clear(me); } } } |