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:
authorBastien Montagne <montagne29@wanadoo.fr>2016-03-04 14:32:35 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2016-03-04 14:35:52 +0300
commitd8b8a6e275cf200dc06779b6c30d02c2f08fd4eb (patch)
treeb5b9fdad2e497e0fa412cad9e9ac86cb95b27a5f /source/blender/editors/space_view3d
parentf2c40ca9f01d44871b055afdcd0434b2a8309927 (diff)
Fix T47683: broken BBox logic when drawing duplis.
Once a dupli had a valid bbox, that bbox would be used for all following objects without bbox, instead of skipping clipping check. Issue unveiled by rB3fa0a1a5bc0ff2, but not related at all (in fact, bug was present before that commit).
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 9abf2ea0f37..087c5338e5f 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2063,7 +2063,6 @@ static void draw_dupli_objects_color(
short transflag;
bool use_displist = false; /* -1 is initialize */
char dt;
- bool testbb = false;
short dtx;
DupliApplyData *apply_data;
@@ -2087,10 +2086,11 @@ static void draw_dupli_objects_color(
if (dob) dob_next = dupli_step(dob->next);
for (; dob; dob_prev = dob, dob = dob_next, dob_next = dob_next ? dupli_step(dob_next->next) : NULL) {
+ bool testbb = false;
+
tbase.object = dob->ob;
/* Make sure lod is updated from dupli's position */
-
savedlod = dob->ob->currentlod;
#ifdef WITH_GAMEENGINE