trailing whitespaces cleanup
This commit is contained in:
+21
-21
@@ -25,7 +25,7 @@ def batch_setup_render_scene(context=None, render_scn=None):
|
||||
for fo in render_scn.node_tree.nodes:
|
||||
if fo.type == 'OUTPUT_FILE':
|
||||
fn.renumber_keep_existing(fo)
|
||||
|
||||
|
||||
## Swap to bg_cam (if any)
|
||||
# if render_scn.objects.get('bg_cam') and (not render_scn.camera or render_scn.camera.name != 'bg_cam'):
|
||||
# print('Swap to bg cam')
|
||||
@@ -66,42 +66,42 @@ class GPEXP_OT_render_auto_build(bpy.types.Operator):
|
||||
@classmethod
|
||||
def poll(cls, context):
|
||||
return context.object and context.object.type == 'GPENCIL'
|
||||
|
||||
|
||||
# timer : bpy.props.FloatProperty(default=0.1, options={'SKIP_SAVE'})
|
||||
|
||||
excluded_prefix : bpy.props.StringProperty(
|
||||
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,
|
||||
clean_name_and_visibility : bpy.props.BoolProperty(name='Clean Name And Visibility', default=True,
|
||||
description='Add object name to layer name when there is only prefix (ex: "CO_")\
|
||||
\nEnable visibility for layer with prefix included in Prefix Filter')
|
||||
|
||||
clean_material_duplication : bpy.props.BoolProperty(name='Clean Material Duplication', default=True,
|
||||
|
||||
clean_material_duplication : bpy.props.BoolProperty(name='Clean Material Duplication', default=True,
|
||||
description='Clean material stack. i.e: Replace "mat.001" in material stack if "mat" exists and has same color')
|
||||
|
||||
prefix_filter : bpy.props.StringProperty(name='Prefix Filter', default='CO, CU, FX, TO', # , MA # exclude MA if mask are applied
|
||||
description='Comma separated prefix to render. Set the other prefix and non-prefixed layer to exluded viewlayer')
|
||||
|
||||
set_layers_colors : bpy.props.BoolProperty(name='Set Layers Colors', default=True,
|
||||
set_layers_colors : bpy.props.BoolProperty(name='Set Layers Colors', default=True,
|
||||
description='')
|
||||
|
||||
trigger_rename_lowercase : bpy.props.BoolProperty(name='Trigger Rename Lowercase', default=True,
|
||||
trigger_rename_lowercase : bpy.props.BoolProperty(name='Trigger Rename Lowercase', default=True,
|
||||
description='')
|
||||
|
||||
trigger_renumber_by_distance : bpy.props.BoolProperty(name='Trigger Renumber By Distance', default=True,
|
||||
trigger_renumber_by_distance : bpy.props.BoolProperty(name='Trigger Renumber By Distance', default=True,
|
||||
description='')
|
||||
|
||||
export_layer_infos : bpy.props.BoolProperty(name='Export Layer Infos', default=True,
|
||||
export_layer_infos : bpy.props.BoolProperty(name='Export Layer Infos', default=True,
|
||||
description='')
|
||||
|
||||
group_all_adjacent_layer_type : bpy.props.BoolProperty(name='Group All Adjacent Layer Type', default=True,
|
||||
group_all_adjacent_layer_type : bpy.props.BoolProperty(name='Group All Adjacent Layer Type', default=True,
|
||||
description='')
|
||||
|
||||
change_to_gp_workspace : bpy.props.BoolProperty(name='Change To Gp Workspace', default=True,
|
||||
change_to_gp_workspace : bpy.props.BoolProperty(name='Change To Gp Workspace', default=True,
|
||||
description='')
|
||||
|
||||
batch_setup_render_scene : bpy.props.BoolProperty(name='Batch Setup Render Scene', default=True,
|
||||
batch_setup_render_scene : bpy.props.BoolProperty(name='Batch Setup Render Scene', default=True,
|
||||
description='')
|
||||
|
||||
|
||||
@@ -116,7 +116,7 @@ class GPEXP_OT_render_auto_build(bpy.types.Operator):
|
||||
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')
|
||||
@@ -132,7 +132,7 @@ class GPEXP_OT_render_auto_build(bpy.types.Operator):
|
||||
col.prop(self, 'batch_setup_render_scene')
|
||||
|
||||
# layout.prop(self, 'clear_unused_view_layers')
|
||||
|
||||
|
||||
def execute(self, context):
|
||||
print('-- Auto-build Render scene --\n')
|
||||
|
||||
@@ -146,9 +146,9 @@ class GPEXP_OT_render_auto_build(bpy.types.Operator):
|
||||
if render_scn:
|
||||
self.report({'ERROR'}, 'A "Render" scene already exists')
|
||||
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:
|
||||
@@ -159,7 +159,7 @@ class GPEXP_OT_render_auto_build(bpy.types.Operator):
|
||||
## Clean name when layer has no name after prefix
|
||||
if re.match(r'^[A-Z]{2}_$', l.info):
|
||||
l.info = l.info + o.name.lower()
|
||||
|
||||
|
||||
## 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 and not 'invisible' in l.info:
|
||||
@@ -202,7 +202,7 @@ class GPEXP_OT_render_auto_build(bpy.types.Operator):
|
||||
print('Trigger renumber by distance')
|
||||
bpy.ops.gp.auto_number_object('EXEC_DEFAULT')
|
||||
# bpy.ops.gp.auto_number_object('INVOKE_DEFAULT')
|
||||
|
||||
|
||||
## Export layer infos ? (skip if json already exists)
|
||||
if self.export_layer_infos:
|
||||
print('Export layer infos (skip if json already exists)')
|
||||
@@ -221,7 +221,7 @@ class GPEXP_OT_render_auto_build(bpy.types.Operator):
|
||||
return {'CANCELLED'}
|
||||
|
||||
context.window.scene = render_scn
|
||||
|
||||
|
||||
## Group all adjacent layer type
|
||||
if self.group_all_adjacent_layer_type:
|
||||
print('Group all adjacent layer type')
|
||||
@@ -252,7 +252,7 @@ class GPEXP_OT_render_auto_build(bpy.types.Operator):
|
||||
|
||||
## Batch setup render scene
|
||||
batch_setup_render_scene(render_scn=render_scn)
|
||||
|
||||
|
||||
## No need for timer anymore !
|
||||
# if batch_setup_render_scene:
|
||||
# if self.timer > 0:
|
||||
@@ -296,7 +296,7 @@ GPEXP_OT_render_auto_build,
|
||||
GPEXP_OT_render_scene_setup,
|
||||
)
|
||||
|
||||
def register():
|
||||
def register():
|
||||
for cls in classes:
|
||||
bpy.utils.register_class(cls)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user