[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47659] trunk/blender/source/blender/ editors/space_clip/tracking_ops.c: Missed NULL-pointer checks in poll some functions

[Sergey Sharybin]

Revision: 47659
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47659
Author:   nazgul
Date:     2012-06-10 09:04:49 +0000 (Sun, 10 Jun 2012)
Log Message:
-----------
Missed NULL-pointer checks in poll some functions

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

Modified: trunk/blender/source/blender/editors/space_clip/tracking_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/tracking_ops.c	2012-06-10 07:51:57 UTC (rev 47658)
+++ trunk/blender/source/blender/editors/space_clip/tracking_ops.c	2012-06-10 09:04:49 UTC (rev 47659)
@@ -2140,15 +2140,18 @@
 	if (sc) {
 		Scene *scene = CTX_data_scene(C);
 		MovieClip *clip = ED_space_clip(sc);
-		MovieTracking *tracking = &clip->tracking;
-		MovieTrackingObject *tracking_object = BKE_tracking_active_object(tracking);
 
-		if (tracking_object->flag & TRACKING_OBJECT_CAMERA) {
-			return TRUE;
+		if (clip) {
+			MovieTracking *tracking = &clip->tracking;
+			MovieTrackingObject *tracking_object = BKE_tracking_active_object(tracking);
+
+			if (tracking_object->flag & TRACKING_OBJECT_CAMERA) {
+				return TRUE;
+			}
+			else {
+				return OBACT != NULL;
+			}
 		}
-		else {
-			return OBACT != NULL;
-		}
 	}
 
 	return FALSE;
@@ -2750,10 +2753,13 @@
 
 	if (sc) {
 		MovieClip *clip = ED_space_clip(sc);
-		MovieTracking *tracking = &clip->tracking;
-		MovieTrackingObject *tracking_object = BKE_tracking_active_object(tracking);
 
-		return (tracking_object->flag & TRACKING_OBJECT_CAMERA) == 0;
+		if (clip) {
+			MovieTracking *tracking = &clip->tracking;
+			MovieTrackingObject *tracking_object = BKE_tracking_active_object(tracking);
+
+			return (tracking_object->flag & TRACKING_OBJECT_CAMERA) == 0;
+		}
 	}
 
 	return FALSE;