Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Eagar <joeedh@gmail.com>2009-04-03 08:36:38 +0400
committerJoseph Eagar <joeedh@gmail.com>2009-04-03 08:36:38 +0400
commit60bd7d12fcde42ff048a0c83684b1b53dfec6f93 (patch)
tree8cdbeafdd722ee4299bf2e4d1abc4208c44a0e7e
parentd573e9c5390a438b6e606a12d05dc2c6ad06a174 (diff)
fix for last commit, needed some additional checks
-rw-r--r--source/blender/src/drawgpencil.c2
-rw-r--r--source/blender/src/gpencil.c2
2 files changed, 4 insertions, 0 deletions
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);
}