Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-06-02 19:21:10 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-06-02 19:21:10 +0300
commit68e5c082b8dc0472dc7c9d870c68497d88bc4f19 (patch)
tree183596460451c264786785a3fd87ec4bd6e86fbd /source/blender/draw
parentf6b9b452d8bb2424b11f5c80cb18ef2c37648558 (diff)
Fix for crash/error drawing duplis
Drawing object centers used stack memory, we don't want to draw these anyway so add check.
Diffstat (limited to 'source/blender/draw')
-rw-r--r--source/blender/draw/modes/object_mode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 8abe59b1cbf..45e035acc73 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -1610,7 +1610,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
}
/* don't show object extras in set's */
- if ((ob->base_flag & BASE_FROM_SET) == 0) {
+ if ((ob->base_flag & (BASE_FROM_SET | BASE_FROMDUPLI)) == 0) {
DRW_shgroup_object_center(stl, ob);
DRW_shgroup_relationship_lines(stl, ob);