griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Missed NULL-pointer checks in poll some functions

Browse Source
This commit is contained in:
Sergey Sharybin
2012-06-10 09:04:49 +00:00
parent 945cc4651a
commit bdc10e7b41
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/editors/space_clip/tracking_ops.c
View File

@@ -2140,14 +2140,17 @@ static int set_orientation_poll(bContext *C)
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;
}
else {
return OBACT != NULL;
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;
}
}
}
@@ -2750,10 +2753,13 @@ static int set_solution_scale_poll(bContext *C)
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;