blender
/
blender
126
394
Fork 565
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix for infinite freestyle re-render in the viewport 

Was a regression since e618d8238e and was caused by the wrong
main being tagged for update.
This commit is contained in:
Sergey Sharybin 2014-01-15 17:42:01 +06:00
parent 8ff58ee491
commit ebbb6adf32
Notes: blender-bot 2023-02-14 11:19:12 +01:00 
Referenced by issue #38299, Knife tool bug
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
View File

@ -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;
}

2
source/blender/render/intern/source/convertblender.c
View File

@ -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 */