svn merge -r 15392:15551 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / blender / src / drawview.c
index 2f1cdb8b951b4a28f9bba3c1f6504a8dca40706a..f595a101f63e3484a069430faa44f09bf2de62f8 100644 (file)
@@ -3097,7 +3097,7 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
                        if(v3d->lay & base->lay) {
                                
                                BIF_ThemeColorBlend(TH_WIRE, TH_BACK, 0.6f);
-                               draw_object(base, DRAW_CONSTCOLOR);
+                               draw_object(base, DRAW_CONSTCOLOR|DRAW_SCENESET);
 
                                if(base->object->transflag & OB_DUPLI) {
                                        draw_dupli_objects_color(v3d, base, TH_WIRE);
@@ -3319,7 +3319,7 @@ void drawview3d_render(struct View3D *v3d, int winx, int winy, float winmat[][4]
                                        where_is_object(base->object);
        
                                        BIF_ThemeColorBlend(TH_WIRE, TH_BACK, 0.6f);
-                                       draw_object(base, DRAW_CONSTCOLOR);
+                                       draw_object(base, DRAW_CONSTCOLOR|DRAW_SCENESET);
        
                                        if(base->object->transflag & OB_DUPLI) {
                                                draw_dupli_objects(v3d, base);