fix automerge - force set color

1.1.4

- Changed: force set color by prefix if autobuild option swiched on
- fixed: problem with auto merge adjacent layers
This commit is contained in:
pullusb
2023-01-11 18:54:33 +01:00
parent b1cc4fa5d7
commit 0eea0661bc
5 changed files with 27 additions and 7 deletions
+10 -6
View File
@@ -58,7 +58,7 @@ class GPEXP_OT_render_auto_build(bpy.types.Operator):
timer : bpy.props.FloatProperty(default=0.1, options={'SKIP_SAVE'})
excluded_prefix : bpy.props.StringProperty(
name='Excluded Layer By Prefix', default='GP, RG, PO',
name='Excluded Layer By Prefix', default='GP, RG, PO, MA',
description='Exclude layer to send to render by prefix (comma separated list)')
clean_name_and_visibility : bpy.props.BoolProperty(name='Clean Name And Visibility', default=True,
@@ -101,10 +101,11 @@ class GPEXP_OT_render_auto_build(bpy.types.Operator):
layout = self.layout
col = layout.column()
col.prop(self, 'clean_name_and_visibility')
col.prop(self, 'clean_material_duplication')
row = col.row()
row.prop(self, 'prefix_filter')
row.active = self.clean_name_and_visibility
col.prop(self, 'clean_material_duplication')
col.prop(self, 'set_layers_colors')
col.prop(self, 'trigger_rename_lowercase')
@@ -127,6 +128,7 @@ class GPEXP_OT_render_auto_build(bpy.types.Operator):
# TODO : add to preferences / environment var
# prefix_to_render = ['CO', 'CU', 'FX', 'TO', 'MA']
prefix_to_render = [p.strip() for p in self.prefix_filter.split(',')]
print('prefix_to_render: ', prefix_to_render)
render_scn = bpy.data.scenes.get('Render')
if render_scn:
@@ -134,6 +136,7 @@ class GPEXP_OT_render_auto_build(bpy.types.Operator):
return {'CANCELLED'}
all_gp_objects = [o for o in context.scene.objects if o.type == 'GPENCIL']
## clean name and visibility
if self.clean_name_and_visibility:
for o in all_gp_objects:
@@ -145,9 +148,9 @@ class GPEXP_OT_render_auto_build(bpy.types.Operator):
if re.match(r'^[A-Z]{2}_$', l.info):
l.info = l.info + o.name.lower()
## Make used prefix visible ?
## Make used prefix visible ?? (maybe some layer were intentionally hidden...)
if (res := re.search(r'^([A-Z]{2})_', l.info)):
if res.group(1) in prefix_to_render and l.hide == True:
if res.group(1) in prefix_to_render and l.hide == True and not 'invisible' in l.info:
print(f'{o.name} -> {l.info} : Switch visibility On')
l.hide = False
@@ -167,8 +170,9 @@ class GPEXP_OT_render_auto_build(bpy.types.Operator):
## Set layers colors (skip if colors were already set ?)
if self.set_layers_colors:
# Option: Maybe find a way to create a color from prefix hash ? (always give unique color with same prefix on other project!)
fn.set_layer_colors(skip_if_colored=True)
## Option: Maybe find a way to create a color from prefix hash ?
## (always give unique color with same prefix whatever the project!)
fn.set_layer_colors(skip_if_colored=False)
## Trigger rename lowercase
if self.trigger_rename_lowercase: