Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-01-15 15:42:01 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-01-15 15:42:01 +0400
commitebbb6adf32b91660aab13cf4f5061ae916af0a30 (patch)
tree92141b7e229e8b539c2706c7724555a44d76361c /source/blender/render
parent8ff58ee491f3723e750ea0f331f6f658d85c7789 (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.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/convertblender.c2
1 files changed, 1 insertions, 1 deletions
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 */