[Bf-blender-cvs] [5c47a333620] greasepencil-object: Enable Loop Onion in Relative mode
Antonio Vazquez
noreply at git.blender.org
Sun Mar 18 11:48:15 CET 2018
Commit: 5c47a333620097ced203ca6211102d0e4316437b
Author: Antonio Vazquez
Date: Sun Mar 18 11:48:06 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB5c47a333620097ced203ca6211102d0e4316437b
Enable Loop Onion in Relative mode
===================================================================
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 7a338236e3b..257944f9433 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -1057,7 +1057,7 @@ class GreasePencilOnionPanel:
row.active = gpd.use_onion_skinning
row.prop(gpd, "use_onion_fade", text="Fade")
subrow = row.row()
- subrow.active = gpd.onion_mode == 'SELECTED'
+ subrow.active = gpd.onion_mode in ('RELATIVE', 'SELECTED')
subrow.prop(gpd, "use_onion_loop", text="Loop")
# -----------------
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
index 4eb51f2b694..8895642190d 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_cache_impl.c
@@ -1033,7 +1033,7 @@ static void gpencil_draw_onionskins(
}
/* if loop option, save the frame to use later */
- if ((mode == GP_ONION_MODE_SELECTED) && (gpd->onion_flag & GP_ONION_LOOP)) {
+ if ((mode != GP_ONION_MODE_ABSOLUTE) && (gpd->onion_flag & GP_ONION_LOOP)) {
gpf_loop = gf;
}
More information about the Bf-blender-cvs
mailing list