Commit: f51438aea0ec2f15b5a2285216d21d821bbaad79
Author: Brecht Van Lommel
Date: Sat Jun 24 18:02:30 2017 +0200
Branches: master
https://developer.blender.org/rBf51438aea0ec2f15b5a2285216d21d821bbaad79
Fix T51792: crash calling bpy.ops.screen.animation_cancel while scrubbing.
===================================================================
M source/blender/editors/screen/screen_ops.c
===================================================================
diff --git a/source/blender/editors/screen/screen_ops.c
b/source/blender/editors/screen/screen_ops.c
index 9dbc082c119..c99d9add432 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -3756,7 +3756,7 @@ static int screen_animation_cancel_exec(bContext *C,
wmOperator *op)
bScreen *screen = ED_screen_animation_playing(CTX_wm_manager(C));
if (screen) {
- if (RNA_boolean_get(op->ptr, "restore_frame")) {
+ if (RNA_boolean_get(op->ptr, "restore_frame") &&
screen->animtimer) {
ScreenAnimData *sad = screen->animtimer->customdata;
Scene *scene = CTX_data_scene(C);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
