[Bf-blender-cvs] [ab05108acb2] blender2.8: Depsgraph: Make it more explicit in naming what version of data getetrs returns

Sergey Sharybin noreply at git.blender.org
Thu Jul 13 12:57:51 CEST 2017


Commit: ab05108acb20203bad415e69cdf239287e41af19
Author: Sergey Sharybin
Date:   Thu Jul 13 12:57:19 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBab05108acb20203bad415e69cdf239287e41af19

Depsgraph: Make it more explicit in naming what version of data getetrs returns

===================================================================

M	source/blender/depsgraph/DEG_depsgraph_query.h
M	source/blender/depsgraph/intern/depsgraph_query.cc
M	source/blender/draw/intern/draw_manager.c
M	source/blender/editors/space_view3d/view3d_draw.c
M	source/blender/editors/space_view3d/view3d_edit.c
M	source/blender/editors/uvedit/uvedit_draw.c

===================================================================

diff --git a/source/blender/depsgraph/DEG_depsgraph_query.h b/source/blender/depsgraph/DEG_depsgraph_query.h
index 674389ddd6c..04584c07d4b 100644
--- a/source/blender/depsgraph/DEG_depsgraph_query.h
+++ b/source/blender/depsgraph/DEG_depsgraph_query.h
@@ -56,13 +56,13 @@ bool DEG_id_type_tagged(struct Main *bmain, short idtype);
 short DEG_get_eval_flags_for_id(struct Depsgraph *graph, struct ID *id);
 
 /* Get scene the despgraph is created for. */
-struct Scene *DEG_get_scene(struct Depsgraph *graph);
+struct Scene *DEG_get_evaluated_scene(struct Depsgraph *graph);
 
 /* Get scene layer the despgraph is created for. */
-struct SceneLayer *DEG_get_scene_layer(struct Depsgraph *graph);
+struct SceneLayer *DEG_get_evaluated_scene_layer(struct Depsgraph *graph);
 
-/* Get the object as properly evaluated by depsgraph. */
-struct Object *DEG_get_object(struct Depsgraph *depsgraph, struct Object *ob);
+/* Get evaluated version of object for given original one. */
+struct Object *DEG_get_evaluated_object(struct Depsgraph *depsgraph, struct Object *object);
 
 /* Get evaluated version of given ID datablock. */
 struct ID *DEG_get_evaluated_id(struct Depsgraph *depsgraph, struct ID *id);
diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc
index b0ec4575fc5..0ab13730755 100644
--- a/source/blender/depsgraph/intern/depsgraph_query.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query.cc
@@ -81,16 +81,16 @@ short DEG_get_eval_flags_for_id(Depsgraph *graph, ID *id)
 	return id_node->eval_flags;
 }
 
-Scene *DEG_get_scene(Depsgraph *graph)
+Scene *DEG_get_evaluated_scene(Depsgraph *graph)
 {
 	DEG::Depsgraph *deg_graph = reinterpret_cast<DEG::Depsgraph *>(graph);
 	Scene *scene_orig = deg_graph->scene;
 	return reinterpret_cast<Scene *>(deg_graph->get_cow_id(&scene_orig->id));
 }
 
-SceneLayer *DEG_get_scene_layer(Depsgraph *graph)
+SceneLayer *DEG_get_evaluated_scene_layer(Depsgraph *graph)
 {
-	Scene *scene = DEG_get_scene(graph);
+	Scene *scene = DEG_get_evaluated_scene(graph);
 	if (scene != NULL) {
 		DEG::Depsgraph *deg_graph = reinterpret_cast<DEG::Depsgraph *>(graph);
 		return BKE_scene_layer_context_active_ex(deg_graph->bmain, scene);
@@ -98,10 +98,9 @@ SceneLayer *DEG_get_scene_layer(Depsgraph *graph)
 	return NULL;
 }
 
-Object *DEG_get_object(Depsgraph *depsgraph, Object *ob)
+Object *DEG_get_evaluated_object(Depsgraph *depsgraph, Object *object)
 {
-	DEG::Depsgraph *deg_graph = reinterpret_cast<DEG::Depsgraph *>(depsgraph);
-	return (Object *)deg_graph->get_cow_id(&ob->id);
+	return (Object *)DEG_get_evaluated_id(depsgraph, &object->id);
 }
 
 ID *DEG_get_evaluated_id(struct Depsgraph *depsgraph, ID *id)
@@ -117,12 +116,12 @@ ID *DEG_get_evaluated_id(struct Depsgraph *depsgraph, ID *id)
 void DEG_objects_iterator_begin(BLI_Iterator *iter, DEGObjectsIteratorData *data)
 {
 	Depsgraph *graph = data->graph;
-	SceneLayer *scene_layer = DEG_get_scene_layer(graph);
+	SceneLayer *scene_layer = DEG_get_evaluated_scene_layer(graph);
 
 	iter->data = data;
 	iter->valid = true;
 
-	data->scene = DEG_get_scene(graph);
+	data->scene = DEG_get_evaluated_scene(graph);
 	DEG_evaluation_context_init(&data->eval_ctx, DAG_EVAL_RENDER);
 
 	/* TODO(sergey): It's really confusing to store pointer to a local data. */
@@ -207,7 +206,7 @@ void DEG_objects_iterator_next(BLI_Iterator *iter)
 	base = data->base->next;
 	while (base != NULL) {
 		if ((base->flag & BASE_VISIBLED) != 0) {
-			// Object *ob = DEG_get_object(data->graph, base->object);
+			// Object *ob = DEG_get_evaluated_object(data->graph, base->object);
 			Object *ob = base->object;
 			iter->current = ob;
 			data->base = base;
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 79242436322..df0693dc23b 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -3045,8 +3045,8 @@ void DRW_draw_render_loop_ex(
         ARegion *ar, View3D *v3d,
         const bContext *evil_C)
 {
-	Scene *scene = DEG_get_scene(graph);
-	SceneLayer *sl = DEG_get_scene_layer(graph);
+	Scene *scene = DEG_get_evaluated_scene(graph);
+	SceneLayer *sl = DEG_get_evaluated_scene_layer(graph);
 	RegionView3D *rv3d = ar->regiondata;
 
 	DST.draw_ctx.evil_C = evil_C;
@@ -3185,8 +3185,8 @@ void DRW_draw_select_loop(
         ARegion *ar, View3D *v3d,
         bool UNUSED(use_obedit_skip), bool UNUSED(use_nearest), const rcti *rect)
 {
-	Scene *scene = DEG_get_scene(graph);
-	SceneLayer *sl = DEG_get_scene_layer(graph);
+	Scene *scene = DEG_get_evaluated_scene(graph);
+	SceneLayer *sl = DEG_get_evaluated_scene_layer(graph);
 #ifndef USE_GPU_SELECT
 	UNUSED_VARS(vc, scene, sl, v3d, ar, rect);
 #else
@@ -3303,8 +3303,8 @@ void DRW_draw_depth_loop(
         Depsgraph *graph,
         ARegion *ar, View3D *v3d)
 {
-	Scene *scene = DEG_get_scene(graph);
-	SceneLayer *sl = DEG_get_scene_layer(graph);
+	Scene *scene = DEG_get_evaluated_scene(graph);
+	SceneLayer *sl = DEG_get_evaluated_scene_layer(graph);
 	RegionView3D *rv3d = ar->regiondata;
 
 	/* backup (_never_ use rv3d->viewport) */
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 0cfc11f22b8..1afa8cda111 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -699,7 +699,7 @@ void ED_view3d_draw_depth(
         struct Depsgraph *graph,
         ARegion *ar, View3D *v3d, bool alphaoverride)
 {
-	Scene *scene = DEG_get_scene(graph);
+	Scene *scene = DEG_get_evaluated_scene(graph);
 	RegionView3D *rv3d = ar->regiondata;
 
 	short zbuf = v3d->zbuf;
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 9ac86d4e13a..8bb0619c45b 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -4938,7 +4938,7 @@ void ED_view3d_autodist_init(
 			break;
 		case 1:
 		{
-			Scene *scene = DEG_get_scene(graph);
+			Scene *scene = DEG_get_evaluated_scene(graph);
 			ED_view3d_draw_depth_gpencil(scene, ar, v3d);
 			break;
 		}
diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index f8c0e24c061..f6a86c64c1b 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -655,7 +655,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, SceneLayer *sl, Object *obe
 	/* 1. draw shadow mesh */
 	
 	if (sima->flag & SI_DRAWSHADOW) {
-		Object *ob_cage = DEG_get_object(depsgraph, obedit);
+		Object *ob_cage = DEG_get_evaluated_object(depsgraph, obedit);
 		/* XXX TODO: Need to check if shadow mesh is different than original mesh. */
 		bool is_cage_like_final_meshes = (ob_cage == obedit);




More information about the Bf-blender-cvs mailing list