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>2012-06-07 18:21:25 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-07 18:21:25 +0400
commit3140cd993d4c63ef597bf5a2314fab7e8e847667 (patch)
treeec003359d2bda4296594e44ff7683f83936d9ed4
parent35a274711ef26d0014e70d66f8fab337d4d54312 (diff)
fix for crash with selecting camera bundles.
-rw-r--r--source/blender/editors/space_view3d/drawobject.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 63780ebbd20..2c59e2861e5 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -1744,7 +1744,9 @@ static void draw_viewport_reconstruction(Scene *scene, Base *base, View3D *v3d,
glDisable(GL_COLOR_MATERIAL);
glDisable(GL_LIGHTING);
- glColor3ubv(ob_wire_col);
+ if ((flag & DRAW_CONSTCOLOR) == 0) {
+ glColor3ubv(ob_wire_col);
+ }
if (flag & DRAW_PICKING)
glLoadName(base->selcol);