Camera tracking integration
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 23 Jul 2011 16:42:54 +0000 (16:42 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 23 Jul 2011 16:42:54 +0000 (16:42 +0000)
===========================

VIEW3D_CAMERA_BORDER_HACK broke bundles displaying in 3d viewport.

source/blender/editors/space_view3d/drawobject.c

index 226c67efd3b465d5ca34ac416eacbc0cd8e634b7..3f13f04c09570381bcd874977203bf4ab9308d01 100644 (file)
@@ -1568,6 +1568,10 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
        const float scay= 1.0f / len_v3(ob->obmat[1]);
        const float scaz= 1.0f / len_v3(ob->obmat[2]);
 
+       /* draw data for movie clip set as active for scene */
+       if(scene->clip)
+               draw_viewport_reconstruction(scene, base, v3d, scene->clip, flag);
+
 #ifdef VIEW3D_CAMERA_BORDER_HACK
        if(is_view && !(G.f & G_PICKSEL)) {
                glGetFloatv(GL_CURRENT_COLOR, view3d_camera_border_hack_col);
@@ -1637,10 +1641,6 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
                glVertex3fv(vec[4]);
        glEnd();
 
-       /* draw data for movie clip set as active for scene */
-       if(scene->clip)
-               draw_viewport_reconstruction(scene, base, v3d, scene->clip, flag);
-
        if(is_view)
                return;