diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-29 13:01:07 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-29 13:07:48 +0300 |
commit | d4ac65d003244db4368222f52fbc8fad1cf9a788 (patch) | |
tree | 4c6e025067e995d1cf25921ca20d771d4bd2722d /source/blender/editors/space_view3d/view3d_utils.c | |
parent | 643259415dc5eea78bfac0fbaa5b148b39932a17 (diff) |
Cleanup: use same 'depsgraph' name everywhere outside of DEG space.
'graph' is waaaayyyyy too generic name outside of DEG context, and
better try to use same name everywhere!
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_utils.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_utils.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/editors/space_view3d/view3d_utils.c b/source/blender/editors/space_view3d/view3d_utils.c index 90b1b043de6..8b0b461d443 100644 --- a/source/blender/editors/space_view3d/view3d_utils.c +++ b/source/blender/editors/space_view3d/view3d_utils.c @@ -899,7 +899,7 @@ static float view_autodist_depth_margin(ARegion *ar, const int mval[2], int marg * \param fallback_depth_pt: Use this points depth when no depth can be found. */ bool ED_view3d_autodist( - struct Depsgraph *graph, ARegion *ar, View3D *v3d, + struct Depsgraph *depsgraph, ARegion *ar, View3D *v3d, const int mval[2], float mouse_worldloc[3], const bool alphaoverride, const float fallback_depth_pt[3]) { @@ -909,7 +909,7 @@ bool ED_view3d_autodist( bool depth_ok = false; /* Get Z Depths, needed for perspective, nice for ortho */ - ED_view3d_draw_depth(graph, ar, v3d, alphaoverride); + ED_view3d_draw_depth(depsgraph, ar, v3d, alphaoverride); /* Attempt with low margin's first */ i = 0; @@ -936,19 +936,18 @@ bool ED_view3d_autodist( } } -void ED_view3d_autodist_init( - struct Depsgraph *graph, +void ED_view3d_autodist_init(struct Depsgraph *depsgraph, ARegion *ar, View3D *v3d, int mode) { /* Get Z Depths, needed for perspective, nice for ortho */ switch (mode) { case 0: - ED_view3d_draw_depth(graph, ar, v3d, true); + ED_view3d_draw_depth(depsgraph, ar, v3d, true); break; case 1: { - Scene *scene = DEG_get_evaluated_scene(graph); - ED_view3d_draw_depth_gpencil(graph, scene, ar, v3d); + Scene *scene = DEG_get_evaluated_scene(depsgraph); + ED_view3d_draw_depth_gpencil(depsgraph, scene, ar, v3d); break; } } |