blender/blender
156
495
Fork 735
Code Issues 6.7k Pull Requests 892 Projects 18 Wiki Activity

GPv3: Change layer property to "active_layer" #121563

Merged
Falk David merged 1 commits from PratikPB2123/blender:gpv3-activelayer-prop into main 2024-05-08 12:18:13 +02:00
Conversation 3 Commits 1 Files Changed 5 +13 -13
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/startup/bl_ui/properties_data_grease_pencil.py
View File

@ -24,7 +24,7 @@ class LayerDataButtonsPanel:
@classmethod
def poll(cls, context):
grease_pencil = context.grease_pencil
return grease_pencil and grease_pencil.layers.active
return grease_pencil and grease_pencil.layers.active_layer
class GREASE_PENCIL_UL_masks(UIList):
@ -44,7 +44,7 @@ class GreasePencil_LayerMaskPanel:
def draw_header(self, context):
ob = context.object
grease_pencil = ob.data
layer = grease_pencil.layers.active
layer = grease_pencil.layers.active_layer
self.layout.prop(layer, "use_masks", text="", toggle=0)
@ -52,7 +52,7 @@ class GreasePencil_LayerMaskPanel:
layout = self.layout
ob = context.object
grease_pencil = ob.data
layer = grease_pencil.layers.active
layer = grease_pencil.layers.active_layer
layout = self.layout
layout.enabled = layer.use_masks
@ -86,7 +86,7 @@ class GreasePencil_LayerTransformPanel:
ob = context.object
grease_pencil = ob.data
layer = grease_pencil.layers.active
layer = grease_pencil.layers.active_layer
layout.active = not layer.lock
row = layout.row(align=True)
@ -106,7 +106,7 @@ class GreasPencil_LayerRelationsPanel:
ob = context.object
grease_pencil = ob.data
layer = grease_pencil.layers.active
layer = grease_pencil.layers.active_layer
layout.active = not layer.lock
row = layout.row(align=True)
@ -137,7 +137,7 @@ class GREASE_PENCIL_MT_layer_mask_add(Menu):
layout = self.layout
grease_pencil = context.grease_pencil
active_layer = grease_pencil.layers.active
active_layer = grease_pencil.layers.active_layer
found = False
for layer in grease_pencil.layers:
if layer == active_layer or layer.name in active_layer.mask_layers:
@ -202,7 +202,7 @@ class DATA_PT_grease_pencil_layers(DataButtonsPanel, Panel):
layout = self.layout
grease_pencil = context.grease_pencil
layer = grease_pencil.layers.active
layer = grease_pencil.layers.active_layer
row = layout.row()
row.template_grease_pencil_layer_tree()

4
scripts/startup/bl_ui/properties_grease_pencil_common.py
View File

@ -291,7 +291,7 @@ class GREASE_PENCIL_MT_move_to_layer(Menu):
for i in range(len(grease_pencil.layers) - 1, -1, -1):
layer = grease_pencil.layers[i]
if layer == grease_pencil.layers.active:
if layer == grease_pencil.layers.active_layer:
icon = 'GREASEPENCIL'
else:
icon = 'NONE'
@ -316,7 +316,7 @@ class GREASE_PENCIL_MT_layer_active(Menu):
for i in range(len(obd.layers) - 1, -1, -1):
layer = obd.layers[i]
if layer == obd.layers.active:
if layer == obd.layers.active_layer:
icon = 'GREASEPENCIL'
else:
icon = 'NONE'

4
scripts/startup/bl_ui/space_dopesheet.py
View File

@ -853,7 +853,7 @@ class GreasePencilLayersDopeSheetPanel:
return False
grease_pencil = ob.data
active_layer = grease_pencil.layers.active
active_layer = grease_pencil.layers.active_layer
if active_layer:
return True
@ -925,7 +925,7 @@ class DOPESHEET_PT_grease_pencil_mode(GreasePencilLayersDopeSheetPanel, Panel):
ob = context.object
grease_pencil = ob.data
active_layer = grease_pencil.layers.active
active_layer = grease_pencil.layers.active_layer
if active_layer:
row = layout.row(align=True)

2
source/blender/editors/interface/templates/interface_template_grease_pencil_layer_tree.cc
View File

@ -198,7 +198,7 @@ class LayerViewItem : public AbstractTreeViewItem {
&grease_pencil_.id, &RNA_GreasePencilv3Layers, nullptr);
PointerRNA value_ptr = RNA_pointer_create(&grease_pencil_.id, &RNA_GreasePencilLayer, &layer_);
PropertyRNA *prop = RNA_struct_find_property(&grease_pencil_ptr, "active");
PropertyRNA *prop = RNA_struct_find_property(&grease_pencil_ptr, "active_layer");
RNA_property_pointer_set(&grease_pencil_ptr, prop, value_ptr, nullptr);
RNA_property_update(&C, &grease_pencil_ptr, prop);

2
source/blender/makesrna/intern/rna_grease_pencil.cc
View File

@ -522,7 +522,7 @@ static void rna_def_grease_pencil_layers_api(BlenderRNA *brna, PropertyRNA *cpro
RNA_def_struct_sdna(srna, "GreasePencil");
RNA_def_struct_ui_text(srna, "Grease Pencil Layers", "Collection of Grease Pencil layers");
prop = RNA_def_property(srna, "active", PROP_POINTER, PROP_NONE);
prop = RNA_def_property(srna, "active_layer", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "GreasePencilLayer");
RNA_def_property_pointer_funcs(prop,
"rna_GreasePencil_active_layer_get",