BogdanNagirniak/blender-addons
0
1
Fork 2
forked from blender/blender-addons
Code Pull Requests Activity

BLEN-358: Error in console after closing Blender #4

Merged
Bogdan Nagirniak merged 2 commits from BLEN-358_1 into materialx-addon 2023-04-11 17:16:30 +02:00
Conversation 0 Commits 2 Files Changed 2 +8 -8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6fa90046d8 - Show all commits

16
materialx/bl_nodes/shader.py
View File

@ -238,7 +238,7 @@ class ShaderNodeMixShader(NodeParser):
if shader1_type not in input_types: if shader1_type not in input_types:
log.warn(f'Node {self.node.bl_idname} ({self.material.name_full}) ignored. ' log.warn(f'Node {self.node.bl_idname} ({self.material.name_full}) ignored. '
f'Input type must be of types {input_types}, actual: {shader1_type}') f'Input type must be of types {input_types}, actual: {shader1_type}')
return None return shader1
mix = self.create_node('mix', shader1_type.lower(), prefix='PBR', inputs={ mix = self.create_node('mix', shader1_type.lower(), prefix='PBR', inputs={
'fg': shader1, 'fg': shader1,
@ -250,7 +250,7 @@ class ShaderNodeMixShader(NodeParser):
if shader2_type not in input_types: if shader2_type not in input_types:
log.warn(f'Node {self.node.bl_idname} ({self.material.name_full}) ignored. ' log.warn(f'Node {self.node.bl_idname} ({self.material.name_full}) ignored. '
f'Input type must be of types {input_types}, actual: {shader2_type}') f'Input type must be of types {input_types}, actual: {shader2_type}')
return None return shader2
mix = self.create_node('mix', shader2_type.lower(), prefix='PBR', inputs={ mix = self.create_node('mix', shader2_type.lower(), prefix='PBR', inputs={
'bg': shader2, 'bg': shader2,
@ -264,12 +264,12 @@ class ShaderNodeMixShader(NodeParser):
log.warn(f'Types of input shaders must be the same. ' log.warn(f'Types of input shaders must be the same. '
f'First shader type: {shader1_type}, second shader type: {shader2_type}') f'First shader type: {shader1_type}, second shader type: {shader2_type}')
return None return shader1
if shader1_type not in input_types: if shader1_type not in input_types:
log.warn(f'Node {self.node.bl_idname} ({self.material.name_full}) ignored. ' log.warn(f'Node {self.node.bl_idname} ({self.material.name_full}) ignored. '
f'Input type must be of types {input_types}, actual: {shader1_type}, {shader2_type}') f'Input type must be of types {input_types}, actual: {shader1_type}, {shader2_type}')
return None return shader1
mix = self.create_node('mix', shader1_type.lower(), prefix='PBR', inputs={ mix = self.create_node('mix', shader1_type.lower(), prefix='PBR', inputs={
'fg': shader1, 'fg': shader1,
@ -306,7 +306,7 @@ class ShaderNodeAddShader(NodeParser):
if shader1_type not in input_types: if shader1_type not in input_types:
log.warn(f'Node {self.node.bl_idname} ({self.material.name_full}) ignored. ' log.warn(f'Node {self.node.bl_idname} ({self.material.name_full}) ignored. '
f'Input type must be of types {input_types}, actual: {shader1_type}') f'Input type must be of types {input_types}, actual: {shader1_type}')
return None return shader1
add = self.create_node('add', shader1_type.lower(), prefix='PBR', inputs={ add = self.create_node('add', shader1_type.lower(), prefix='PBR', inputs={
'in1': shader1 'in1': shader1
@ -317,7 +317,7 @@ class ShaderNodeAddShader(NodeParser):
if shader2_type not in input_types: if shader2_type not in input_types:
log.warn(f'Node {self.node.bl_idname} ({self.material.name_full}) ignored. ' log.warn(f'Node {self.node.bl_idname} ({self.material.name_full}) ignored. '
f'Input type must be of types {input_types}, actual: {shader2_type}') f'Input type must be of types {input_types}, actual: {shader2_type}')
return None return shader2
add = self.create_node('add', shader2_type.lower(), prefix='PBR', inputs={ add = self.create_node('add', shader2_type.lower(), prefix='PBR', inputs={
'in2': shader2 'in2': shader2
@ -330,12 +330,12 @@ class ShaderNodeAddShader(NodeParser):
log.warn(f'Types of input shaders must be the same. ' log.warn(f'Types of input shaders must be the same. '
f'First shader type: {shader1_type}, second shader type: {shader2_type}') f'First shader type: {shader1_type}, second shader type: {shader2_type}')
return None return shader1
if shader1_type not in input_types: if shader1_type not in input_types:
log.warn(f'Node {self.node.bl_idname} ({self.material.name_full}) ignored. ' log.warn(f'Node {self.node.bl_idname} ({self.material.name_full}) ignored. '
f'Input type must be of types {input_types}, actual: {shader1_type}, {shader2_type}') f'Input type must be of types {input_types}, actual: {shader1_type}, {shader2_type}')
return None return shader1
add = self.create_node('add', shader1_type.lower(), prefix='PBR', inputs={ add = self.create_node('add', shader1_type.lower(), prefix='PBR', inputs={
'in1': shader1, 'in1': shader1,