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/drawobject.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/drawobject.c')
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 7bb95ba6d15..a86614c52fd 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -1727,7 +1727,7 @@ static void draw_viewport_object_reconstruction( continue; if (dflag & DRAW_PICKING) - GPU_select_load_id(base->selcol + (tracknr << 16)); + GPU_select_load_id(base->object->select_color + (tracknr << 16)); gpuPushMatrix(); gpuTranslate3fv(track->bundle_pos); @@ -1889,7 +1889,7 @@ static void draw_viewport_reconstruction( GPU_basic_shader_bind(GPU_SHADER_USE_COLOR); if (dflag & DRAW_PICKING) - GPU_select_load_id(base->selcol); + GPU_select_load_id(base->object->select_color); } /* camera frame */ |