blender/blender-addons
19
43
Fork 96
Code Issues 628 Pull Requests 27 Projects 1 Releases Wiki Activity

Fixed branch for Blender 3.6 release #104626

Closed
Sebastian Sille wants to merge 22 commits from (deleted):blender-v3.6-release into blender-v3.6-release
pull from: (deleted):blender-v3.6-release
merge into: blender:blender-v3.6-release

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 22 Files Changed 4 -9
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0c0b00d6df - Show all commits

9
node_wrangler/operators.py
View File

@ -1349,7 +1349,6 @@ class NWMergeNodes(Operator, NWBase):
if tree_type == 'COMPOSITING': if tree_type == 'COMPOSITING':
first = 1 first = 1
second = 2 second = 2
add.width_hidden = 100.0
elif nodes_list == selected_math: elif nodes_list == selected_math:
add_type = node_type + 'Math' add_type = node_type + 'Math'
add = nodes.new(add_type) add = nodes.new(add_type)
@ -1359,7 +1358,6 @@ class NWMergeNodes(Operator, NWBase):
loc_y = loc_y - 50 loc_y = loc_y - 50
first = 0 first = 0
second = 1 second = 1
add.width_hidden = 100.0
elif nodes_list == selected_shader: elif nodes_list == selected_shader:
if mode == 'MIX': if mode == 'MIX':
add_type = node_type + 'MixShader' add_type = node_type + 'MixShader'
@ -1369,7 +1367,6 @@ class NWMergeNodes(Operator, NWBase):
loc_y = loc_y - 50 loc_y = loc_y - 50
first = 1 first = 1
second = 2 second = 2
add.width_hidden = 100.0
elif mode == 'ADD': elif mode == 'ADD':
add_type = node_type + 'AddShader' add_type = node_type + 'AddShader'
add = nodes.new(add_type) add = nodes.new(add_type)
@ -1378,7 +1375,6 @@ class NWMergeNodes(Operator, NWBase):
loc_y = loc_y - 50 loc_y = loc_y - 50
first = 0 first = 0
second = 1 second = 1
add.width_hidden = 100.0
elif nodes_list == selected_geometry: elif nodes_list == selected_geometry:
if mode in ('JOIN', 'MIX'): if mode in ('JOIN', 'MIX'):
add_type = node_type + 'JoinGeometry' add_type = node_type + 'JoinGeometry'
@ -1401,7 +1397,6 @@ class NWMergeNodes(Operator, NWBase):
loc_y = loc_y - 50 loc_y = loc_y - 50
first = 0 first = 0
second = 1 second = 1
add.width_hidden = 100.0
elif nodes_list == selected_z: elif nodes_list == selected_z:
add = nodes.new('CompositorNodeZcombine') add = nodes.new('CompositorNodeZcombine')
add.show_preview = False add.show_preview = False
@ -1410,7 +1405,6 @@ class NWMergeNodes(Operator, NWBase):
loc_y = loc_y - 50 loc_y = loc_y - 50
first = 0 first = 0
second = 2 second = 2
add.width_hidden = 100.0
elif nodes_list == selected_alphaover: elif nodes_list == selected_alphaover:
add = nodes.new('CompositorNodeAlphaOver') add = nodes.new('CompositorNodeAlphaOver')
add.show_preview = False add.show_preview = False
@ -1419,7 +1413,6 @@ class NWMergeNodes(Operator, NWBase):
loc_y = loc_y - 50 loc_y = loc_y - 50
first = 1 first = 1
second = 2 second = 2
add.width_hidden = 100.0
add.location = loc_x, loc_y add.location = loc_x, loc_y
loc_y += offset_y loc_y += offset_y
add.select = True add.select = True
@ -2184,7 +2177,6 @@ class NWAddReroutes(Operator, NWBase):
# unhide 'REROUTE' nodes to avoid issues with location.y # unhide 'REROUTE' nodes to avoid issues with location.y
if node.type == 'REROUTE': if node.type == 'REROUTE':
node.hide = False node.hide = False
# When node is hidden - width_hidden not usable.
# Hack needed to calculate real width # Hack needed to calculate real width
if node.hide: if node.hide:
bpy.ops.node.select_all(action='DESELECT') bpy.ops.node.select_all(action='DESELECT')
@ -2726,7 +2718,6 @@ class NWAddMultipleImages(Operator, NWBase, ImportHelper):
new_nodes.append(node) new_nodes.append(node)
node.label = fname node.label = fname
node.hide = True node.hide = True
node.width_hidden = 100
node.location.x = xloc node.location.x = xloc
node.location.y = yloc node.location.y = yloc
yloc -= 40 yloc -= 40