griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GPv3: Python error after active_layer renaming

Browse Source 
Caused by 0a64785067
Remaining instances of `active_layer` wasn't renamed to `active`.

Pull Request: https://projects.blender.org/blender/blender/pulls/125296
This commit is contained in:
Pratik Borhade
2024-07-23 11:47:56 +02:00
committed by Falk David
parent 0c836f7f1a
commit e373625e73
3 changed files with 12 additions and 12 deletions
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)