diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-20 12:18:57 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-03-26 16:13:40 +0300 |
| commit | da44371fdf9a01291c3f56fd7f5480b39b7656aa (patch) | |
| tree | e6da7cf29741cb7850f4e54dd162631b3047a403 /source | |
| parent | 7a771a6c3443e3224d5d95f08d0f5d8eeab45064 (diff) | |
Replacing boundbox temporarily during drawing is dangerous, since it
can be freed at any point.
Luckily we only need the boundbox locally for testing dupli visibility.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index ac2c9f2f612..2bec1433e69 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -2060,11 +2060,9 @@ static void draw_dupli_objects_color( for (; dob; dob_prev = dob, dob = dob_next, dob_next = dob_next ? dupli_step(dob_next->next) : NULL) { /* for restoring after override */ DerivedMesh *store_final_dm; - BoundBox *store_bb; tbase.object = dob->ob; store_final_dm = dob->ob->derivedFinal; - store_bb = dob->ob->bb; /* Make sure lod is updated from dupli's position */ @@ -2110,7 +2108,7 @@ static void draw_dupli_objects_color( tbase.flag |= OB_FROMCACHE; tbase.object->derivedFinal = dob_data->cache_dm; - tbase.object->bb = bb_tmp = &dob_data->bb; + bb_tmp = &dob_data->bb; } } if (!bb_tmp) @@ -2188,7 +2186,6 @@ static void draw_dupli_objects_color( /* restore final DM */ tbase.object->derivedFinal = store_final_dm; - tbase.object->bb = store_bb; } if (apply_data) { |