blender
/
blender
135
403
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

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.
This commit is contained in:
Campbell Barton 2019-02-19 11:37:27 +11:00
parent ec57d76db8
commit 790cb7799d
Notes: blender-bot 2023-02-14 03:40:03 +01:00 
Referenced by issue #61857, Eevee dephth of field not working if the camera is in orthographic mode.
Referenced by issue #61729, After adding and deleting driver Value node stucks (Material)
Referenced by issue #61724, uv export absent
Referenced by issue #61704, Eevee - material gets darkened when shader is being mixed with itself using 'mix shader'
Referenced by issue #61705, Texture Paint, texture map transformation not responding
Referenced by issue #61695, Billboard particles not displaying in Eevee viewport, render
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/object.c
View File

@ -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]);
}
}
}

4
source/blender/blenkernel/intern/object_update.c
View File

@ -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]);
}
}

2
source/blender/draw/modes/object_mode.c
View File

@ -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]);
}

2
source/blender/makesdna/DNA_object_types.h
View File

@ -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). */