[Bf-blender-cvs] [790cb7799dc] master: Cleanup: rename parent_origin_eval to parent_display_origin

[Campbell Barton]

Commit: 790cb7799dcfa9eda0f938f354e1a411714ec0df
Author: Campbell Barton
Date:   Tue Feb 19 11:37:27 2019 +1100
Branches: master
https://developer.blender.org/rB790cb7799dcfa9eda0f938f354e1a411714ec0df

Cleanup: rename parent_origin_eval to parent_display_origin

The term 'eval' is often used by depsgraph result,
where this is just used for drawing.

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

M	source/blender/blenkernel/intern/object.c
M	source/blender/blenkernel/intern/object_update.c
M	source/blender/draw/modes/object_mode.c
M	source/blender/makesdna/DNA_object_types.h

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

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index ccb5f0d0b02..80c8f973663 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -2190,10 +2190,10 @@ static void solve_parenting(Object *ob, Object *par, float obmat[4][4],
 	/* origin, for help line */
 	if (set_origin) {
 		if ((ob->partype & PARTYPE) == PARSKEL) {
-			copy_v3_v3(ob->runtime.parent_origin_eval, par->obmat[3]);
+			copy_v3_v3(ob->runtime.parent_display_origin, par->obmat[3]);
 		}
 		else {
-			copy_v3_v3(ob->runtime.parent_origin_eval, totmat[3]);
+			copy_v3_v3(ob->runtime.parent_display_origin, totmat[3]);
 		}
 	}
 }
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 9ab25f01f7b..955f2f905d3 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -106,10 +106,10 @@ void BKE_object_eval_parent(Depsgraph *depsgraph, Object *ob)
 
 	/* origin, for help line */
 	if ((ob->partype & PARTYPE) == PARSKEL) {
-		copy_v3_v3(ob->runtime.parent_origin_eval, par->obmat[3]);
+		copy_v3_v3(ob->runtime.parent_display_origin, par->obmat[3]);
 	}
 	else {
-		copy_v3_v3(ob->runtime.parent_origin_eval, totmat[3]);
+		copy_v3_v3(ob->runtime.parent_display_origin, totmat[3]);
 	}
 }
 
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 22409746c13..05f44a0f2f9 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -2553,7 +2553,7 @@ static void DRW_shgroup_relationship_lines(
         Object *ob)
 {
 	if (ob->parent && (DRW_object_visibility_in_active_context(ob->parent) & OB_VISIBLE_SELF)) {
-		DRW_shgroup_call_dynamic_add(sgl->relationship_lines, ob->runtime.parent_origin_eval);
+		DRW_shgroup_call_dynamic_add(sgl->relationship_lines, ob->runtime.parent_display_origin);
 		DRW_shgroup_call_dynamic_add(sgl->relationship_lines, ob->obmat[3]);
 	}
 
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 540b8d725f9..050110c14cb 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -136,7 +136,7 @@ typedef struct Object_Runtime {
 	char _pad0[3];
 
 	/** Only used for drawing the parent/child help-line. */
-	float parent_origin_eval[3];
+	float parent_display_origin[3];
 
 
 	/** Axis aligned boundbox (in localspace). */