[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38509] branches/soc-2011-tomato/source/ blender/editors: Camera tracking integration

[Sergey Sharybin]

Revision: 38509
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38509
Author:   nazgul
Date:     2011-07-19 13:02:00 +0000 (Tue, 19 Jul 2011)
Log Message:
-----------
Camera tracking integration
===========================

- Do not show bundles in 3d viewport if "Only Render" option is enabled.
- Fixed bug with incorrect track state.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c

Modified: branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c	2011-07-19 12:42:01 UTC (rev 38508)
+++ branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c	2011-07-19 13:02:00 UTC (rev 38509)
@@ -515,8 +515,8 @@
 	y= (marker->pos[1]+dy)*height*zoomy-14.f*UI_DPI_FAC;
 
 	if(marker->flag&MARKER_DISABLED) strcpy(state, "disabled");
+	else if(marker->framenr!=sc->user.framenr) strcpy(state, "estimated");
 	else if(marker->flag&MARKER_TRACKED) strcpy(state, "tracked");
-	else if(marker->framenr!=sc->user.framenr) strcpy(state, "estimated");
 	else strcpy(state, "keyframed");
 
 	if(state[0])

Modified: branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c	2011-07-19 12:42:01 UTC (rev 38508)
+++ branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c	2011-07-19 13:02:00 UTC (rev 38509)
@@ -1600,6 +1600,9 @@
 	if((v3d->flag2&V3D_SHOW_RECONSTRUCTION)==0)
 		return;
 
+	if(v3d->flag2&V3D_RENDER_OVERRIDE)
+		return;
+
 	BKE_get_tracking_mat(scene, mat);
 
 	glEnable(GL_LIGHTING);