[Bf-blender-cvs] [8c5bff94d1b] greasepencil-object: Fix: Temporary fix for crashes when moving GP keyframes when toggling Onion Skinning

Joshua Leung noreply at git.blender.org
Tue Nov 14 14:57:41 CET 2017


Commit: 8c5bff94d1bb4711cd8feb79e02d4bbd0c6233b1
Author: Joshua Leung
Date:   Wed Nov 15 02:57:01 2017 +1300
Branches: greasepencil-object
https://developer.blender.org/rB8c5bff94d1bb4711cd8feb79e02d4bbd0c6233b1

Fix: Temporary fix for crashes when moving GP keyframes when toggling Onion Skinning

ANIM_list_elem_update() was not doing anything as ale->id was null,
and we were filtering the channels by "animdata" blocks (i.e. the GP
datablocks). While technically what we're doing here isn't totally
correct (I'll need to come up with a better fix tomorrow), this will
be a good quick-fix for the crashes they animators are currently getting.

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

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

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

diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c
index a56a21ce445..14f8912a28a 100644
--- a/source/blender/editors/animation/anim_filter.c
+++ b/source/blender/editors/animation/anim_filter.c
@@ -1659,7 +1659,7 @@ static size_t animdata_filter_gpencil_data(ListBase *anim_data, bDopeSheet *ads,
 	 */
 	if (filter_mode & ANIMFILTER_ANIMDATA) {
 		/* just add GPD as a channel - this will add everything needed */
-		ANIMCHANNEL_NEW_CHANNEL(gpd, ANIMTYPE_GPDATABLOCK, NULL);
+		ANIMCHANNEL_NEW_CHANNEL(gpd, ANIMTYPE_GPDATABLOCK, gpd);
 	}
 	else {
 		ListBase tmp_data = {NULL, NULL};



More information about the Bf-blender-cvs mailing list