Commit: b47c912f4be877bf5511117864dfc2a5b30c0dca
Author: Alexander Romanov
Date: Fri Dec 23 16:51:26 2016 +0300
Branches: master
https://developer.blender.org/rBb47c912f4be877bf5511117864dfc2a5b30c0dca
Fix (unreported) crash in 'Match movie length operator' in case of lost video
texture file
===================================================================
M source/blender/editors/space_image/image_ops.c
===================================================================
diff --git a/source/blender/editors/space_image/image_ops.c
b/source/blender/editors/space_image/image_ops.c
index f5da7d5..6a1c0e7 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1475,7 +1475,10 @@ static int image_match_len_exec(bContext *C, wmOperator
*UNUSED(op))
if (!ima || !iuser || !BKE_image_has_anim(ima))
return OPERATOR_CANCELLED;
- iuser->frames = IMB_anim_get_duration(((ImageAnim *)
ima->anims.first)->anim, IMB_TC_RECORD_RUN);
+ struct ImageAnim *anim = ((ImageAnim *)ima->anims.first)->anim;
+ if (!anim)
+ return OPERATOR_CANCELLED;
+ iuser->frames = IMB_anim_get_duration(anim, IMB_TC_RECORD_RUN);
BKE_image_user_frame_calc(iuser, scene->r.cfra, 0);
return OPERATOR_FINISHED;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
