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/draw | |
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/draw')
-rw-r--r-- | source/blender/draw/intern/draw_armature.c | 2 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c index bbb22ad2548..47af8a3c8a4 100644 --- a/source/blender/draw/intern/draw_armature.c +++ b/source/blender/draw/intern/draw_armature.c @@ -1297,7 +1297,7 @@ static void draw_armature_pose(Object *ob, const float const_color[4]) } if (arm->flag & ARM_POSEMODE) { - index = ob->base_selection_color; + index = ob->select_color; } } diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 7d6907ec318..08ff7b52a38 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -3052,7 +3052,7 @@ void DRW_draw_select_loop( DEG_OBJECT_ITER(graph, ob, DEG_OBJECT_ITER_FLAG_DUPLI) { if ((ob->base_flag & BASE_SELECTABLED) != 0) { - DRW_select_load_id(ob->base_selection_color); + DRW_select_load_id(ob->select_color); DRW_engines_cache_populate(ob); } } |