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>2017-11-07 18:29:31 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-11-07 18:36:25 +0300
commitba1197fe5e27f1cb7be281b3f20166a69050a273 (patch)
treed2852f12af386701db2f3c8dddf96b185efb248e /source/blender/makesrna/intern/rna_scene_api.c
parentf16199d479189f1f142aebecf896182a7276c483 (diff)
Depsgraph: Simplify some workarounds and make API closer to final
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene_api.c')
-rw-r--r--source/blender/makesrna/intern/rna_scene_api.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index 6b315ddf1c9..78afba0e426 100644
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -89,11 +89,7 @@ static void rna_Scene_frame_set(Scene *scene, Main *bmain, int frame, float subf
scene_layer != NULL;
scene_layer = scene_layer->next)
{
- Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, scene_layer);
- /* TODO(sergey): This is a temporary solution. */
- if (depsgraph == NULL) {
- scene->depsgraph_legacy = depsgraph = DEG_graph_new();
- }
+ Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, scene_layer, true);
BKE_scene_graph_update_for_newframe(bmain->eval_ctx, depsgraph, bmain, scene);
}
@@ -139,11 +135,7 @@ static void rna_Scene_update_tagged(Scene *scene, Main *bmain)
scene_layer != NULL;
scene_layer = scene_layer->next)
{
- Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, scene_layer);
- /* TODO(sergey): This is a temporary solution. */
- if (depsgraph == NULL) {
- scene->depsgraph_legacy = depsgraph = DEG_graph_new();
- }
+ Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, scene_layer, true);
BKE_scene_graph_update_tagged(bmain->eval_ctx, depsgraph, bmain, scene);
}