diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-07 18:35:23 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-06-08 11:46:45 +0300 |
commit | 23c93873f4073e440d3817465252d8f86134654c (patch) | |
tree | a2d8d03ca46d21ef6bca1aff38a6b7f2139343a9 /source/blender/editors/space_view3d/view3d_draw_legacy.c | |
parent | d675415eef9f565b1828f48dfe874321af1c4af8 (diff) |
Remove selection color from the base
Use indirect access to it via object.
It was already flushing from base to object, now we can avoid such flushing.
Still weird to have selection color filled in by dependency graph, but now
there is no synchronization going on at least.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_draw_legacy.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_draw_legacy.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c index a27c5df9128..4c15a291c9c 100644 --- a/source/blender/editors/space_view3d/view3d_draw_legacy.c +++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c @@ -914,7 +914,7 @@ static void view3d_draw_xray_select(Scene *scene, SceneLayer *sl, ARegion *ar, V v3d->xray = true; while ((v3da = BLI_pophead(&v3d->afterdraw_xray))) { - if (GPU_select_load_id(v3da->base->selcol)) { + if (GPU_select_load_id(v3da->base->object->select_color)) { draw_object_select(scene, sl, ar, v3d, v3da->base, v3da->dflag); } MEM_freeN(v3da); @@ -1301,10 +1301,10 @@ void ED_view3d_draw_select_loop( if (((base->flag & BASE_SELECTABLED) == 0) || (use_obedit_skip && (scene->obedit->data == base->object->data))) { - base->selcol = 0; + base->object->select_color = 0; } else { - base->selcol = code; + base->object->select_color = code; if (use_nearest && (base->object->dtx & OB_DRAWXRAY)) { ED_view3d_after_add(&v3d->afterdraw_xray, base, dflag); |