[Bf-blender-cvs] [7c76fc12c55] greasepencil-object: GPencil: Group all icons after opacity
Antonio Vazquez
noreply at git.blender.org
Thu Nov 28 18:56:53 CET 2019
Commit: 7c76fc12c55430ee9f2c1d0270e48a39d91a3b4c
Author: Antonio Vazquez
Date: Thu Nov 28 18:56:40 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB7c76fc12c55430ee9f2c1d0270e48a39d91a3b4c
GPencil: Group all icons after opacity
===================================================================
M source/blender/editors/animation/anim_channels_defines.c
===================================================================
diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 25e9e902e6f..9c316436ba7 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -5069,15 +5069,6 @@ void ANIM_channel_draw_widgets(const bContext *C,
RNA_id_pointer_create(ale->id, &id_ptr);
int icon;
- /* Mask Layer. */
- UI_block_emboss_set(block, UI_EMBOSS_NONE);
- prop = RNA_struct_find_property(&ptr, "mask_layer");
- gp_rna_path = RNA_path_from_ID_to_property(&ptr, prop);
- if (RNA_path_resolve_property(&id_ptr, gp_rna_path, &ptr, &prop)) {
- icon = (gpl->flag & GP_LAYER_USE_MASK) ? ICON_MOD_MASK : ICON_LAYER_ACTIVE;
- uiDefAutoButR(
- block, &ptr, prop, array_index, "", icon, offset, ymid, width, channel_height);
- }
/* Layer opacity. */
UI_block_emboss_set(block, UI_EMBOSS);
prop = RNA_struct_find_property(&ptr, "opacity");
@@ -5089,14 +5080,31 @@ void ANIM_channel_draw_widgets(const bContext *C,
array_index,
"",
ICON_NONE,
- offset + width,
+ offset,
ymid,
width * 3,
channel_height);
}
- /* Layer onion skinning switch. */
+ /* Mask Layer. */
UI_block_emboss_set(block, UI_EMBOSS_NONE);
+ prop = RNA_struct_find_property(&ptr, "mask_layer");
+ gp_rna_path = RNA_path_from_ID_to_property(&ptr, prop);
+ if (RNA_path_resolve_property(&id_ptr, gp_rna_path, &ptr, &prop)) {
+ icon = (gpl->flag & GP_LAYER_USE_MASK) ? ICON_MOD_MASK : ICON_LAYER_ACTIVE;
+ uiDefAutoButR(block,
+ &ptr,
+ prop,
+ array_index,
+ "",
+ icon,
+ offset + (width * 3),
+ ymid,
+ width,
+ channel_height);
+ }
+
+ /* Layer onion skinning switch. */
prop = RNA_struct_find_property(&ptr, "use_onion_skinning");
gp_rna_path = RNA_path_from_ID_to_property(&ptr, prop);
if (RNA_path_resolve_property(&id_ptr, gp_rna_path, &ptr, &prop)) {
More information about the Bf-blender-cvs
mailing list