diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-06 16:19:16 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-06 16:24:27 +0300 |
| commit | 7fee5f56438712ebc6e9fd1737ae83fa05e1c2cd (patch) | |
| tree | c6010f802bfdb94986fd04de07410cfb3cd966c8 | |
| parent | f1fd5ed74fb0afd602f53860d0b2db46189c218a (diff) | |
Fix object-dupli selection w/ COW
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index d2554443d7b..63631dd4a18 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1698,8 +1698,11 @@ void DRW_draw_select_loop( DEG_ITER_OBJECT_FLAG_DUPLI) { if ((ob->base_flag & BASE_SELECTABLED) != 0) { - Object *ob_orig = DEG_get_original_object(ob); - DRW_select_load_id(ob_orig->select_color); + /* This relies on dupli instances being after their instancing object. */ + if ((ob->base_flag & BASE_FROMDUPLI) == 0) { + Object *ob_orig = DEG_get_original_object(ob); + DRW_select_load_id(ob_orig->select_color); + } drw_engines_cache_populate(ob); } } |