svn merge ^/trunk/blender -r49143:49145
authorCampbell Barton <ideasman42@gmail.com>
Mon, 23 Jul 2012 16:43:48 +0000 (16:43 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 23 Jul 2012 16:43:48 +0000 (16:43 +0000)
source/blender/editors/space_view3d/view3d_draw.c

index 306807fa16681493766ceb3567596ff50fe03ad1..0203b19f7656d8f2d2c90bfacdab7213f4b81c47 100644 (file)
@@ -1779,8 +1779,12 @@ static void view3d_draw_bgpic_test(Scene *scene, ARegion *ar, View3D *v3d,
        if ((v3d->flag & V3D_DISPBGPICS) == 0)
                return;
 
+       /* disabled - mango request, since footage /w only render is quite useful
+        * and this option is easy to disable all background images at once */
+#if 0
        if (v3d->flag2 & V3D_RENDER_OVERRIDE)
                return;
+#endif
 
        if ((rv3d->view == RV3D_VIEW_USER) || (rv3d->persp != RV3D_ORTHO)) {
                if (rv3d->persp == RV3D_CAMOB) {