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

[Sergey Sharybin]

Revision: 40655
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40655
Author:   nazgul
Date:     2011-09-28 13:31:18 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
Camera tracking integration
===========================

- Fixed crash when creating new scene.
- Fixed usage of uninitialized variable.

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

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-09-28 11:56:50 UTC (rev 40654)
+++ branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c	2011-09-28 13:31:18 UTC (rev 40655)
@@ -1487,11 +1487,14 @@
 				BKE_image_user_calc_frame(&bgpic->iuser, CFRA, 0);
 				ibuf= BKE_image_get_ibuf(ima, &bgpic->iuser);
 			} else {
+				clip= NULL;
+
 				if(bgpic->flag&V3D_BGPIC_CAMERACLIP) {
 					if(!scene->camera)
 						scene->camera= scene_find_camera(scene);
 
-					clip= object_get_movieclip(scene, scene->camera);
+					if(scene->camera)
+						clip= object_get_movieclip(scene, scene->camera);
 				} else clip= bgpic->clip;
 
 				if(clip==NULL)