Jason-Fielder/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

Fix_105606_MetalTextureUploadRegression #1

Closed
Michael Parkin-White wants to merge 17 commits from Fix_105606_MetalTextureUploadRegression into Fix_103605_MetalBarycentrics
pull from: Fix_105606_MetalTextureUploadRegression
merge into: Jason-Fielder:Fix_103605_MetalBarycentrics

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 17 Files Changed 24 +4
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 69c6158cc8 - Show all commits

4
source/blender/editors/gpencil/gpencil_edit.c
View File

@ -1715,6 +1715,10 @@ static int gpencil_strokes_paste_exec(bContext *C, wmOperator *op)
*/ */
for (bGPDframe *gpf = init_gpf; gpf; gpf = gpf->next) { for (bGPDframe *gpf = init_gpf; gpf; gpf = gpf->next) {
/* Active frame is copied later, so don't need duplicate the stroke here. */
if (gpl->actframe == gpf) {
continue;
}
if (gpf->flag & GP_FRAME_SELECT) { if (gpf->flag & GP_FRAME_SELECT) {
if (gpf) { if (gpf) {
/* Create new stroke */ /* Create new stroke */