diff options
author | Joshua Leung <aligorith@gmail.com> | 2015-12-06 15:27:12 +0300 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2015-12-06 15:27:12 +0300 |
commit | f501a4dd9635d198243e2955b72fc6f8fb073908 (patch) | |
tree | 616aa5c570f69746ecc397134e1fc3e704a52da8 /source/blender/editors/transform/transform_conversions.c | |
parent | 80b1620cf33991a4c307f77357209ae6139196bf (diff) |
GPencil: Code Cleanup - Deduplicate code for adding a copy of the active frame (for editing)
Diffstat (limited to 'source/blender/editors/transform/transform_conversions.c')
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 40 |
1 files changed, 1 insertions, 39 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 4dcef3acb41..6360535a696 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -7756,45 +7756,7 @@ static void createTransGPencil(bContext *C, TransInfo *t) */ // XXX: should this be allowed when framelock is enabled? if (gpf->framenum != cfra) { - bGPDframe *new_frame = gpencil_frame_duplicate(gpf); - bGPDframe *gf; - bool found = false; - - /* Find frame to insert it before */ - for (gf = gpl->frames.first; gf; gf = gf->next) { - if (gf->framenum > cfra) { - /* Add it here */ - BLI_insertlinkbefore(&gpl->frames, gf, new_frame); - - found = true; - break; - } - else if (gf->framenum == cfra) { - /* This only happens when we're editing with framelock on... - * - Delete the new frame and don't do anything else here... - */ - //printf("GP Frame convert to TransData - Copy aborted for frame %d -> %d\n", gpf->framenum, gf->framenum); - free_gpencil_strokes(new_frame); - MEM_freeN(new_frame); - new_frame = NULL; - - found = true; - break; - } - } - - if (found == false) { - /* Add new frame to the end */ - BLI_addtail(&gpl->frames, new_frame); - } - - /* Edit the new frame instead, if it did get created + added */ - if (new_frame) { - // TODO: tag this one as being "newly created" so that we can remove it if the edit is cancelled - new_frame->framenum = cfra; - - gpf = new_frame; - } + gpf = gpencil_frame_addcopy(gpl, cfra); } /* Loop over strokes, adding TransData for points as needed... */ |