1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

node_shader_utils: Proper fix for node_normalmap accessor returning ellipsis value.

Browse Source 
Ellipsis value is internal ingredient only, to tag hidden _node_normalmap
'real' property as not yet initialized. Public node_normalmap accessor
should never ever have that value, it's either None or a valid node!
This commit is contained in:
Bastien Montagne 2018-10-17 20:18:40 +02:00
parent 5c038a6930
commit 65ea9ec948
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
release/scripts/modules/bpy_extras/node_shader_utils.py
View File

@ -230,29 +230,28 @@ class PrincipledBSDFWrapper(ShaderWrapper):
def node_normalmap_get(self): def node_normalmap_get(self):
if not self.use_nodes: if not self.use_nodes or self.node_principled_bsdf is None:
return None return None
if self.node_principled_bsdf is not None: node_principled = self.node_principled_bsdf
node_principled = self.node_principled_bsdf if self._node_normalmap is ...:
# Running only once, trying to find a valid normalmap node.
if node_principled.inputs["Normal"].is_linked:
node_normalmap = node_principled.inputs["Normal"].links[0].from_node
if node_normalmap.bl_idname == 'ShaderNodeNormalMap':
self._node_normalmap = node_normalmap
self._grid_to_location(0, 0, ref_node=node_normalmap)
if self._node_normalmap is ...: if self._node_normalmap is ...:
# Running only once, trying to find a valid normalmap node. self._node_normalmap = None
if node_principled.inputs["Normal"].is_linked: if self._node_normalmap is None and not self.is_readonly:
node_normalmap = node_principled.inputs["Normal"].links[0].from_node tree = self.material.node_tree
if node_normalmap.bl_idname == 'ShaderNodeNormalMap': nodes = tree.nodes
self._node_normalmap = node_normalmap links = tree.links
self._grid_to_location(0, 0, ref_node=node_normalmap)
if self._node_normalmap is ...:
self._node_normalmap = None
if self._node_normalmap is None and not self.is_readonly:
tree = self.material.node_tree
nodes = tree.nodes
links = tree.links
node_normalmap = nodes.new(type='ShaderNodeNormalMap') node_normalmap = nodes.new(type='ShaderNodeNormalMap')
node_normalmap.label = "Normal/Map" node_normalmap.label = "Normal/Map"
self._grid_to_location(-1, -2, dst_node=node_normalmap, ref_node=node_principled) self._grid_to_location(-1, -2, dst_node=node_normalmap, ref_node=node_principled)
# Link # Link
links.new(node_normalmap.outputs["Normal"], node_principled.inputs["Normal"]) links.new(node_normalmap.outputs["Normal"], node_principled.inputs["Normal"])
return self._node_normalmap return self._node_normalmap
node_normalmap = property(node_normalmap_get) node_normalmap = property(node_normalmap_get)