diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-15 15:42:01 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-01-15 15:42:01 +0400 |
| commit | ebbb6adf32b91660aab13cf4f5061ae916af0a30 (patch) | |
| tree | 92141b7e229e8b539c2706c7724555a44d76361c | |
| parent | 8ff58ee491f3723e750ea0f331f6f658d85c7789 (diff) | |
Fix for infinite freestyle re-render in the viewport
Was a regression since e618d8238e0e and was caused by the wrong
main being tagged for update.
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp | 3 | ||||
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 8d8b39a6358..1fc5684f9d7 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -472,7 +472,8 @@ Object *BlenderStrokeRenderer::NewMesh() const #else (void)base; #endif - DAG_id_tag_update(&ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); + + DAG_id_tag_update_ex(freestyle_bmain, &ob->id, OB_RECALC_OB | OB_RECALC_DATA | OB_RECALC_TIME); return ob; } diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 57d7a87199c..4f7fbe72b73 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -5148,7 +5148,7 @@ void RE_Database_FromScene(Render *re, Main *bmain, Scene *scene, unsigned int l RE_SetView(re, mat); /* force correct matrix for scaled cameras */ - DAG_id_tag_update(&camera->id, OB_RECALC_OB); + DAG_id_tag_update_ex(re->main, &camera->id, OB_RECALC_OB); } /* store for incremental render, viewmat rotates dbase */ |