From 60bd7d12fcde42ff048a0c83684b1b53dfec6f93 Mon Sep 17 00:00:00 2001 From: Joseph Eagar Date: Fri, 3 Apr 2009 04:36:38 +0000 Subject: [PATCH] fix for last commit, needed some additional checks --- source/blender/src/drawgpencil.c | 2 ++ source/blender/src/gpencil.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/source/blender/src/drawgpencil.c b/source/blender/src/drawgpencil.c index 914a604de44..3c6cef469a2 100644 --- a/source/blender/src/drawgpencil.c +++ b/source/blender/src/drawgpencil.c @@ -139,6 +139,8 @@ void gp_ui_delstroke_cb (void *gpd, void *gpl) { bGPDframe *gpf= gpencil_layer_getframe(gpl, CFRA, 0); + if (gpf->framenum != CFRA) return; + gpencil_layer_setactive(gpd, gpl); gpencil_frame_delete_laststroke(gpf, gpl); diff --git a/source/blender/src/gpencil.c b/source/blender/src/gpencil.c index fa502a1af59..c7e453c416c 100644 --- a/source/blender/src/gpencil.c +++ b/source/blender/src/gpencil.c @@ -702,6 +702,8 @@ void gpencil_delete_laststroke (bGPdata *gpd) bGPDlayer *gpl= gpencil_layer_getactive(gpd); bGPDframe *gpf= gpencil_layer_getframe(gpl, CFRA, 0); + if (gpf->framenum != CFRA) return; + gpencil_frame_delete_laststroke(gpf, gpl); }