[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43023] trunk/blender/source/blender/ editors: Do not set scene's camera on camera solving and cursor snapping

[Sergey Sharybin]

Revision: 43023
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43023
Author:   nazgul
Date:     2011-12-31 08:26:32 +0000 (Sat, 31 Dec 2011)
Log Message:
-----------
Do not set scene's camera on camera solving and cursor snapping

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_clip/tracking_ops.c
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
    trunk/blender/source/blender/editors/space_view3d/view3d_snap.c

Modified: trunk/blender/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/tracking_ops.c      
2011-12-31 03:52:07 UTC (rev 43022)
+++ trunk/blender/source/blender/editors/space_clip/tracking_ops.c      
2011-12-31 08:26:32 UTC (rev 43023)
@@ -1613,9 +1613,6 @@
        id_us_plus(&clip->id);
 
        /* set blender camera focal length so result would look fine there */
-       if(!scene->camera)
-               scene->camera= scene_find_camera(scene);
-
        if(scene->camera) {
                Camera *camera= (Camera*)scene->camera->data;
                int width, height;
@@ -2468,16 +2465,16 @@
                if(tracking_object->flag&TRACKING_OBJECT_CAMERA) {
                        mul_v3_fl(object->size, scale);
                        mul_v3_fl(object->loc, scale);
-               } else
-               if(!scale_solution){
-                       Object *camera= object_solver_camera(scene, object);
+               }
+               else if(!scale_solution){
+                       Object *solver_camera= object_solver_camera(scene, 
object);
 
                        object->size[0]= object->size[1]= object->size[2]= 
1.0f/scale;
 
-                       if(camera) {
-                               object->size[0]/= camera->size[0];
-                               object->size[1]/= camera->size[1];
-                               object->size[2]/= camera->size[2];
+                       if(solver_camera) {
+                               object->size[0]/= solver_camera->size[0];
+                               object->size[1]/= solver_camera->size[1];
+                               object->size[2]/= solver_camera->size[2];
                        }
                }
                else {

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c     
2011-12-31 03:52:07 UTC (rev 43022)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c     
2011-12-31 08:26:32 UTC (rev 43023)
@@ -1521,9 +1521,6 @@
                                clip= NULL;
 
                                if(bgpic->flag&V3D_BGPIC_CAMERACLIP) {
-                                       if(!scene->camera)
-                                               scene->camera= 
scene_find_camera(scene);
-
                                        if(scene->camera)
                                                clip= 
object_get_movieclip(scene, scene->camera, 1);
                                } else clip= bgpic->clip;

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_snap.c     
2011-12-31 03:52:07 UTC (rev 43022)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_snap.c     
2011-12-31 08:26:32 UTC (rev 43023)
@@ -768,10 +768,6 @@
 
        tracking= &clip->tracking;
 
-       /* XXX - seems like an unneeded side effect, snapping should _not_ set 
the active camera for eg. - campbell */
-       if(!scene->camera)
-               scene->camera= scene_find_camera(scene);
-
        if(scene->camera)
                copy_m4_m4(cammat, scene->camera->obmat);
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs