blender/blender
147
472
Fork 689
Code Issues 6.7k Pull Requests 889 Projects 18 Wiki Activity

GPv3: Python error after active_layer renaming #125296

Merged
Falk David merged 1 commits from PratikPB2123/blender:gpv3-aclayer-ac into main 2024-07-23 11:48:11 +02:00
Conversation 0 Commits 1 Files Changed 3 +12 -12
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
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_layer
return grease_pencil and grease_pencil.layers.active
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
layer = grease_pencil.layers.active
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
layer = grease_pencil.layers.active
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
layer = grease_pencil.layers.active
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
layer = grease_pencil.layers.active
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_layer
active_layer = grease_pencil.layers.active
found = False
for layer in grease_pencil.layers:
if layer == active_layer or layer.name in active_layer.mask_layers:
@ -174,7 +174,7 @@ class GREASE_PENCIL_MT_grease_pencil_add_layer_extra(Menu):
layout = self.layout
ob = context.object
grease_pencil = ob.data
layer = grease_pencil.layers.active_layer
layer = grease_pencil.layers.active
space = context.space_data
if space.type == 'PROPERTIES':
@ -223,7 +223,7 @@ class DATA_PT_grease_pencil_layers(DataButtonsPanel, Panel):
layout = self.layout
grease_pencil = context.grease_pencil
layer = grease_pencil.layers.active_layer
layer = grease_pencil.layers.active
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_layer:
if layer == grease_pencil.layers.active:
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_layer:
if layer == obd.layers.active:
icon = 'GREASEPENCIL'
else:
icon = 'NONE'

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

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