[Bf-blender-cvs] [b5a1e3d471a] blender2.8: Depsgraph: add helper to ensure a given scene/view_layer graph is up-to-date.
Bastien Montagne
noreply at git.blender.org
Fri Aug 3 10:26:23 CEST 2018
Commit: b5a1e3d471ad0657a10596b7f2f47b6c7e0fb3f4
Author: Bastien Montagne
Date: Fri Aug 3 10:13:33 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb5a1e3d471ad0657a10596b7f2f47b6c7e0fb3f4
Depsgraph: add helper to ensure a given scene/view_layer graph is up-to-date.
Since that call make the graph active, it should only be used in active
editing context aware code (i.e. essentially, operators).
===================================================================
M source/blender/blenkernel/BKE_scene.h
M source/blender/blenkernel/intern/scene.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h
index e2032e10833..e7a26afadf5 100644
--- a/source/blender/blenkernel/BKE_scene.h
+++ b/source/blender/blenkernel/BKE_scene.h
@@ -147,6 +147,9 @@ void BKE_scene_graph_update_tagged(struct Depsgraph *depsgraph,
void BKE_scene_graph_update_for_newframe(struct Depsgraph *depsgraph,
struct Main *bmain);
+void BKE_scene_view_layer_graph_evaluated_ensure(
+ struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer);
+
struct SceneRenderView *BKE_scene_add_render_view(struct Scene *sce, const char *name);
bool BKE_scene_remove_render_view(struct Scene *scene, struct SceneRenderView *srv);
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index ba25fc14ac9..8522c7f4445 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1477,6 +1477,18 @@ void BKE_scene_graph_update_for_newframe(Depsgraph *depsgraph,
DEG_ids_clear_recalc(bmain, depsgraph);
}
+/** Ensures given scene/view_layer pair has a valid, up-to-date depsgraph.
+ *
+ * \warning Sets matching depsgraph as active, so should only be called from the active editing context
+ * (usually, from operators).
+ */
+void BKE_scene_view_layer_graph_evaluated_ensure(Main *bmain, Scene *scene, ViewLayer *view_layer)
+{
+ Depsgraph *depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true);
+ DEG_make_active(depsgraph);
+ BKE_scene_graph_update_tagged(depsgraph, bmain);
+}
+
/* return default view */
SceneRenderView *BKE_scene_add_render_view(Scene *sce, const char *name)
{
More information about the Bf-blender-cvs
mailing list