diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-04-05 10:54:47 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-04-05 10:54:47 +0400 |
commit | 3fa7717b57f5d0c9667caec856e214c7597ce42c (patch) | |
tree | 942e583fcf81e1baa479c92f10b8ee718cfc84c6 /source | |
parent | 53e721305ef76505257bba3c62c24a042a3030a9 (diff) |
2.4x - Grease Pencil: Swapping the order of args for gpencil_frame_delete_laststroke() to be more consistent with the rest of the Grease Pencil API.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/include/BDR_gpencil.h | 2 | ||||
-rw-r--r-- | source/blender/src/drawgpencil.c | 2 | ||||
-rw-r--r-- | source/blender/src/gpencil.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/include/BDR_gpencil.h b/source/blender/include/BDR_gpencil.h index 6848be2a481..2835e414d1c 100644 --- a/source/blender/include/BDR_gpencil.h +++ b/source/blender/include/BDR_gpencil.h @@ -65,7 +65,7 @@ struct bGPdata *gpencil_data_getactive(struct ScrArea *sa); short gpencil_data_setactive(struct ScrArea *sa, struct bGPdata *gpd); struct ScrArea *gpencil_data_findowner(struct bGPdata *gpd); -void gpencil_frame_delete_laststroke(struct bGPDframe *gpf, bGPDlayer *gpl); +void gpencil_frame_delete_laststroke(struct bGPDlayer *gpl, struct bGPDframe *gpf); struct bGPDframe *gpencil_layer_getframe(struct bGPDlayer *gpl, int cframe, short addnew); void gpencil_layer_delframe(struct bGPDlayer *gpl, struct bGPDframe *gpf); diff --git a/source/blender/src/drawgpencil.c b/source/blender/src/drawgpencil.c index 3c6cef469a2..5cabb38887a 100644 --- a/source/blender/src/drawgpencil.c +++ b/source/blender/src/drawgpencil.c @@ -142,7 +142,7 @@ void gp_ui_delstroke_cb (void *gpd, void *gpl) if (gpf->framenum != CFRA) return; gpencil_layer_setactive(gpd, gpl); - gpencil_frame_delete_laststroke(gpf, gpl); + gpencil_frame_delete_laststroke(gpl, gpf); scrarea_queue_winredraw(curarea); } diff --git a/source/blender/src/gpencil.c b/source/blender/src/gpencil.c index c7e453c416c..4f50a83a3f2 100644 --- a/source/blender/src/gpencil.c +++ b/source/blender/src/gpencil.c @@ -484,7 +484,7 @@ ScrArea *gpencil_data_findowner (bGPdata *gpd) /* -------- GP-Frame API ---------- */ /* delete the last stroke of the given frame */ -void gpencil_frame_delete_laststroke (bGPDframe *gpf, bGPDlayer *gpl) +void gpencil_frame_delete_laststroke (bGPDlayer *gpl, bGPDframe *gpf) { bGPDstroke *gps= (gpf) ? gpf->strokes.last : NULL; @@ -704,7 +704,7 @@ void gpencil_delete_laststroke (bGPdata *gpd) if (gpf->framenum != CFRA) return; - gpencil_frame_delete_laststroke(gpf, gpl); + gpencil_frame_delete_laststroke(gpl, gpf); } /* delete the active frame */ |