[Bf-blender-cvs] [9fe977d] master: Fix T47706: 'CTRL ALT Left Mouse' clicking on the dope sheet summary line crashes Blender

Julian Eisel noreply at git.blender.org
Mon Mar 7 11:23:44 CET 2016


Commit: 9fe977dbf00bc123e7af3d1a6370d996c33bef25
Author: Julian Eisel
Date:   Mon Mar 7 11:21:01 2016 +0100
Branches: master
https://developer.blender.org/rB9fe977dbf00bc123e7af3d1a6370d996c33bef25

Fix T47706: 'CTRL ALT Left Mouse' clicking on the dope sheet summary line crashes Blender

Simple NULL-check seems fine here, working as it should now. Most likely caused by rBc4dc14b079d81.

===================================================================

M	source/blender/editors/animation/keyframes_edit.c

===================================================================

diff --git a/source/blender/editors/animation/keyframes_edit.c b/source/blender/editors/animation/keyframes_edit.c
index 676b792..08a7355 100644
--- a/source/blender/editors/animation/keyframes_edit.c
+++ b/source/blender/editors/animation/keyframes_edit.c
@@ -295,7 +295,7 @@ static short summary_keyframes_loop(KeyframeEditData *ked, bAnimContext *ac, Key
 			case ALE_FCURVE:
 			default:
 			{
-				if (ked->iterflags) {
+				if (ked && ked->iterflags) {
 					/* make backups of the current values, so that a localised fix
 					 * (e.g. NLA time remapping) can be applied to these values
 					 */




More information about the Bf-blender-cvs mailing list