[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38634] branches/soc-2011-tomato/source/ blender/editors/space_view3d/drawobject.c: Camera tracking integration

[Sergey Sharybin]

Revision: 38634
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38634
Author:   nazgul
Date:     2011-07-23 16:42:54 +0000 (Sat, 23 Jul 2011)
Log Message:
-----------
Camera tracking integration
===========================

VIEW3D_CAMERA_BORDER_HACK broke bundles displaying in 3d viewport.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c

Modified: branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c	2011-07-23 16:34:30 UTC (rev 38633)
+++ branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c	2011-07-23 16:42:54 UTC (rev 38634)
@@ -1568,6 +1568,10 @@
 	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 @@
 		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;