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

Fix #31748: Blender crashes when typing "al" after opening spacebar menu.

Browse Source 
Crash was introduced by own refactoring of poll functions in clip editor.
This commit is contained in:
Sergey Sharybin
2012-06-08 08:24:08 +00:00
parent 87211a49ab
commit e446c6af1f
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2135,17 +2135,20 @@ static Object *get_orientation_object(bContext *C)
static int set_orientation_poll(bContext *C)
{
Scene *scene = CTX_data_scene(C);
SpaceClip *sc = CTX_wm_space_clip(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 (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;
}
}
return FALSE;
@@ -2744,11 +2747,16 @@ void CLIP_OT_set_scale(wmOperatorType *ot)
static int set_solution_scale_poll(bContext *C)
{
SpaceClip *sc = CTX_wm_space_clip(C);
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 (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;
}
return FALSE;
}
static int set_solution_scale_exec(bContext *C, wmOperator *op)