[Bf-blender-cvs] [ccb6a043bfc] greasepencil-object: Fix error in change Palette
Antonio Vazquez
noreply at git.blender.org
Sun Aug 13 17:56:28 CEST 2017
Commit: ccb6a043bfc8ecfccba9714e0fc2d7f29f47bfae
Author: Antonio Vazquez
Date: Sun Aug 13 17:56:15 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBccb6a043bfc8ecfccba9714e0fc2d7f29f47bfae
Fix error in change Palette
Must change all frames not only active
===================================================================
M source/blender/editors/gpencil/gpencil_data.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c
index 7bb56c04c51..bbec0aafb40 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -892,9 +892,9 @@ static int gp_stroke_change_palette_exec(bContext *C, wmOperator *op)
if ((type == GP_MOVE_PALETTE_CURRENT) && (gpf->framenum != scene->r.cfra))
continue;
- for (bGPDstroke *gps = gpl->actframe->strokes.last; gps; gps = gps->prev) {
+ for (bGPDstroke *gps = gpf->strokes.last; gps; gps = gps->prev) {
/* only if selected */
- if (((gps->flag & GP_STROKE_SELECT) == 0) || (type != GP_MOVE_PALETTE_SELECT))
+ if (((gps->flag & GP_STROKE_SELECT) == 0) && (type == GP_MOVE_PALETTE_SELECT))
continue;
/* skip strokes that are invalid for current view */
if (ED_gpencil_stroke_can_use(C, gps) == false)
More information about the Bf-blender-cvs
mailing list