trailing whitespaces cleanup
This commit is contained in:
pullusb
+29
-29
@@ -12,10 +12,10 @@ def add_rlayer(layer_name, scene=None, location=None, color=None, node_name=None
|
||||
node_name = layer_name # 'RL_' +
|
||||
|
||||
if not scene:
|
||||
scene=bpy.context.scene
|
||||
|
||||
scene=bpy.context.scene
|
||||
|
||||
nodes = scene.node_tree.nodes
|
||||
|
||||
|
||||
comp = nodes.get(node_name)
|
||||
if comp:
|
||||
if comp.layer == node_name:
|
||||
@@ -33,7 +33,7 @@ def add_rlayer(layer_name, scene=None, location=None, color=None, node_name=None
|
||||
comp.location = location
|
||||
if color:
|
||||
comp.color = color
|
||||
|
||||
|
||||
if width:
|
||||
comp.width = width
|
||||
comp.show_preview = False
|
||||
@@ -51,14 +51,14 @@ def connect_render_layer(rlayer, ng=None, out=None, frame=None):
|
||||
vl_name = rlayer.layer
|
||||
if not vl_name or vl_name == 'View Layer':
|
||||
print(f'Bad layer for node {rlayer.name}')
|
||||
|
||||
|
||||
if not ' / ' in vl_name:
|
||||
print(f'no slash (" / ") separator in vl_name {vl_name}, should be "obj.name / layer_name"')
|
||||
return
|
||||
|
||||
obname, lname = vl_name.split(' / ')
|
||||
lname = bpy.path.clean_name(lname)
|
||||
|
||||
|
||||
if not frame:
|
||||
if rlayer.parent:
|
||||
frame=rlayer.parent
|
||||
@@ -96,7 +96,7 @@ def connect_render_layer(rlayer, ng=None, out=None, frame=None):
|
||||
|
||||
ng_in = fn.create_node('NodeGroupInput', tree=ngroup, location=(-600,0))
|
||||
ng_out = fn.create_node('NodeGroupOutput', tree=ngroup, location=(600,0))
|
||||
|
||||
|
||||
else:
|
||||
ngroup = ng.node_tree
|
||||
ng_in = ngroup.nodes.get('Group Input')
|
||||
@@ -113,20 +113,20 @@ def connect_render_layer(rlayer, ng=None, out=None, frame=None):
|
||||
|
||||
## get nodes from frame
|
||||
# rl_nodes = [n for n in nodes if n.type == 'R_LAYERS' and n.layer != 'View Layer' and n.parent == frame]
|
||||
|
||||
|
||||
# auto clean : if an input exists but is not linked and name not exists in rlayers of current frame
|
||||
for s in reversed(ng.inputs):
|
||||
if not s.is_linked: # and not any(x.layer == s.name for x in rl_nodes)
|
||||
print(f'removing grp unlinked input {s.name}')
|
||||
ng.inputs.remove(s)
|
||||
|
||||
|
||||
## get nodes from linked NG inputs ??? maybe more clear...
|
||||
# rl_nodes = [s.links[0].from_node for s in ng.inputs if s.links and s.links[0].from_node and s.links[0].from_node.type == 'R_LAYERS']
|
||||
|
||||
|
||||
## reorder
|
||||
fn.reorder_inputs(ng)
|
||||
ng.update()
|
||||
|
||||
|
||||
# CREATE NG outsocket (individual, without taking merge)
|
||||
connected = False
|
||||
|
||||
@@ -136,7 +136,7 @@ def connect_render_layer(rlayer, ng=None, out=None, frame=None):
|
||||
if socket:
|
||||
connected = True
|
||||
groupout = ng.outputs.get(socket.name)
|
||||
|
||||
|
||||
ng.update()
|
||||
|
||||
if not connected:
|
||||
@@ -151,7 +151,7 @@ def connect_render_layer(rlayer, ng=None, out=None, frame=None):
|
||||
# ng_in.outputs[vl_name]
|
||||
ngroup.links.new(ng_in.outputs[vl_name], aa.inputs[0]) # node_tree
|
||||
ngroup.links.new(aa.outputs[0], ng_out.inputs[vl_name]) # node_tree
|
||||
|
||||
|
||||
aa.mute = scene.use_aa # mute if native AA is used
|
||||
|
||||
|
||||
@@ -166,7 +166,7 @@ def connect_render_layer(rlayer, ng=None, out=None, frame=None):
|
||||
ng.update()
|
||||
# reorder output to match inputs
|
||||
fn.reorder_outputs(ng)
|
||||
|
||||
|
||||
ng.update()
|
||||
|
||||
# Clear : delete orphan nodes that are not connected from ng_in
|
||||
@@ -180,7 +180,7 @@ def connect_render_layer(rlayer, ng=None, out=None, frame=None):
|
||||
if groupout.links and groupout.links[0].to_node.type == 'OUTPUT_FILE':
|
||||
# if already connected to outfile just skip cause user might have customised the name
|
||||
return
|
||||
|
||||
|
||||
slot_name = f'{lname}/{lname}_'
|
||||
out_name = f'OUT_{obname}' # or get output from frame
|
||||
if not out:
|
||||
@@ -194,7 +194,7 @@ def connect_render_layer(rlayer, ng=None, out=None, frame=None):
|
||||
out.base_path = f'//render/{bpy.path.clean_name(obname)}'
|
||||
|
||||
## out_input = out.inputs.get(slot_name) # ok for non-numbered outputs
|
||||
|
||||
|
||||
out_input = None
|
||||
out_input = fn.get_numbered_output(out, slot_name)
|
||||
|
||||
@@ -235,9 +235,9 @@ def get_set_viewlayer_from_gp(ob, l, scene=None):
|
||||
# ob.data = ob.data.copy() # create duplicate (this will also affect the one in original scene !!!)
|
||||
scene.collection.objects.link(ob)
|
||||
ob.hide_viewport = ob.hide_render = False
|
||||
|
||||
|
||||
## set object active in default viewlayer
|
||||
|
||||
|
||||
# if (avl := scene.view_layers.get('ViewLayer')):
|
||||
# # This select the object in source scene
|
||||
# avl.objects.active = ob
|
||||
@@ -269,7 +269,7 @@ def get_set_viewlayer_from_gp(ob, l, scene=None):
|
||||
|
||||
if rlayer_list: # rlayer exists
|
||||
print(f'{len(rlayer_list)} nodes using {vl_name}')
|
||||
|
||||
|
||||
# affect only the one within an object frame
|
||||
framed_rl = [n for n in rlayer_list if n.parent and n.parent.label == ob.name]
|
||||
if framed_rl:
|
||||
@@ -282,7 +282,7 @@ def get_set_viewlayer_from_gp(ob, l, scene=None):
|
||||
cp.select = True # select so the user see that it existed
|
||||
return vl, cp
|
||||
|
||||
# Returned if existed and OK
|
||||
# Returned if existed and OK
|
||||
|
||||
if not ob.name in frame_dic.keys(): # and len(frame_dic[ob.name])
|
||||
print(f'\n{ob.name} -> {l.info} (first generation)')
|
||||
@@ -303,7 +303,7 @@ def get_set_viewlayer_from_gp(ob, l, scene=None):
|
||||
frame.label = ob.name
|
||||
frame.label_size = 50
|
||||
frame.location = (loc[0], loc[1] + 20)
|
||||
|
||||
|
||||
cp = add_rlayer(vl_name, scene=scene, location=loc)
|
||||
cp.parent = frame
|
||||
# use same color as layer
|
||||
@@ -326,7 +326,7 @@ def get_set_viewlayer_from_gp(ob, l, scene=None):
|
||||
if cp.layer != vl_name:
|
||||
print(f'problem with {cp}: {cp.layer} != {vl_name}')
|
||||
return
|
||||
|
||||
|
||||
if fn.has_channel_color(l):
|
||||
cp.use_custom_color = True
|
||||
cp.color = l.channel_color
|
||||
@@ -339,16 +339,16 @@ def get_set_viewlayer_from_gp(ob, l, scene=None):
|
||||
top_loc = fn.real_loc(rl_nodes[0])
|
||||
else:
|
||||
top_loc = fn.get_frame_transform(frame[1], node_tree) - 60
|
||||
|
||||
|
||||
# cp.location = (top_loc[0], top_loc[1] + 100) # temp location to adjust x loc
|
||||
|
||||
# list of layer names in nodes order
|
||||
rl_names = [n.layer.split(' / ')[1] for n in rl_nodes] # get True layer name from rl
|
||||
# names with the right order WITH the new layer included
|
||||
names = [lay.info for lay in ob.data.layers if lay.info in rl_names or lay == l]
|
||||
|
||||
|
||||
rl_nodes.append(cp)
|
||||
|
||||
|
||||
# filter by getting index(layer_name)
|
||||
cp.parent = frame
|
||||
rl_nodes.sort(key=lambda x : names.index(x.layer.split(' / ')[1])) # Sort True layer name from rl
|
||||
@@ -356,13 +356,13 @@ def get_set_viewlayer_from_gp(ob, l, scene=None):
|
||||
offset = 0
|
||||
# print(f'number of nodes in frame: {len(rl_nodes)}')
|
||||
ref_node = rl_nodes[0]
|
||||
|
||||
|
||||
# print('ref_node: ', ref_node.name, ref_node.location)
|
||||
for n in rl_nodes:
|
||||
# set x loc from first node in list (maybe use leftmost ?)
|
||||
n.location = Vector((fn.real_loc(ref_node)[0], top_loc[1] - offset)) - n.parent.location
|
||||
offset += 180
|
||||
|
||||
|
||||
n.update()
|
||||
# reorder render layers nodes within frame
|
||||
|
||||
@@ -379,12 +379,12 @@ def export_gp_objects(oblist, exclude_list=[], scene=None):
|
||||
oblist = [oblist]
|
||||
if isinstance(exclude_list, str):
|
||||
exclude_list = [p.strip() for p in exclude_list.split(',')]
|
||||
|
||||
|
||||
# print('exclude_list: ', exclude_list)
|
||||
|
||||
for ob in oblist:
|
||||
for l in ob.data.layers:
|
||||
# if l.hide:
|
||||
# if l.hide:
|
||||
# continue
|
||||
if l.hide or any(x + '_' in l.info for x in exclude_list): # exclude hided ?
|
||||
print(f'Exclude export: {ob.name} : {l.info}')
|
||||
|
||||
Reference in New Issue
Block a user