Commit: 7fee5f56438712ebc6e9fd1737ae83fa05e1c2cd
Author: Campbell Barton
Date: Wed Jun 6 15:19:16 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB7fee5f56438712ebc6e9fd1737ae83fa05e1c2cd
Fix object-dupli selection w/ COW
===================================================================
M source/blender/draw/intern/draw_manager.c
===================================================================
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);
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
