[Bf-extensions-cvs] [19819fb1] master: PyAPI: Remove CyclesShaderWrapper
Aaron Carlisle
noreply at git.blender.org
Thu Sep 5 20:36:29 CEST 2019
Commit: 19819fb1ce7e3a3a603a32e6eac7f548cfbcf866
Author: Aaron Carlisle
Date: Thu Sep 5 14:33:27 2019 -0400
Branches: master
https://developer.blender.org/rBA19819fb1ce7e3a3a603a32e6eac7f548cfbcf866
PyAPI: Remove CyclesShaderWrapper
This has been replaced in 2.80 with PrincipledBSDFWrapper
which python developers should use instead.
Internally CyclesShaderWrapper is no longer used however,
3rd party scripts may still be using this which means
they must update scripts for Blender 2.81.
===================================================================
D modules/cycles_shader_compat.py
===================================================================
diff --git a/modules/cycles_shader_compat.py b/modules/cycles_shader_compat.py
deleted file mode 100644
index 7013ed2e..00000000
--- a/modules/cycles_shader_compat.py
+++ /dev/null
@@ -1,543 +0,0 @@
-# ##### BEGIN GPL LICENSE BLOCK #####
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ##### END GPL LICENSE BLOCK #####
-
-# <pep8 compliant>
-
-import bpy
-import math
-
-__all__ = (
- "CyclesShaderWrapper",
- )
-
-
-class CyclesShaderWrapper():
- """
- Hard coded shader setup.
- Suitable for importers, adds basic:
- diffuse/spec/alpha/normal/bump/reflect.
- """
- __slots__ = (
- "material",
-
- "node_out",
- "node_mix_shader_spec",
- "node_mix_shader_alpha",
- "node_mix_shader_refl",
-
- "node_bsdf_alpha",
- "node_bsdf_diff",
- "node_bsdf_spec",
- "node_bsdf_refl",
-
- "node_mix_color_alpha",
- "node_mix_color_diff",
- "node_mix_color_spec",
- "node_mix_color_hard",
- "node_mix_color_refl",
- "node_mix_color_bump",
-
- "node_normalmap",
- "node_texcoords",
-
- "node_image_alpha",
- "node_image_diff",
- "node_image_spec",
- "node_image_hard",
- "node_image_refl",
- "node_image_bump",
- "node_image_normalmap",
- )
-
- _col_size = 200
- _row_size = 220
-
- def __init__(self, material):
-
- COLOR_WHITE = 1.0, 1.0, 1.0, 1.0
- COLOR_BLACK = 0.0, 0.0, 0.0, 1.0
-
- self.material = material
- self.material.use_nodes = True
-
- tree = self.material.node_tree
-
- nodes = tree.nodes
- links = tree.links
- nodes.clear()
-
- # ----
- # Add shaders
- node = nodes.new(type='ShaderNodeOutputMaterial')
- node.label = "Material Out"
- node.location = self._grid_location(6, 4)
- self.node_out = node
- del node
-
- node = nodes.new(type='ShaderNodeAddShader')
- node.label = "Shader Add Refl"
- node.location = self._grid_location(5, 4)
- self.node_mix_shader_refl = node
- del node
- # Link
- links.new(self.node_mix_shader_refl.outputs["Shader"],
- self.node_out.inputs["Surface"])
-
- node = nodes.new(type='ShaderNodeAddShader')
- node.label = "Shader Add Spec"
- node.location = self._grid_location(4, 4)
- self.node_mix_shader_spec = node
- del node
- # Link
- links.new(self.node_mix_shader_spec.outputs["Shader"],
- self.node_mix_shader_refl.inputs[0])
-
- # --------------------------------------------------------------------
- # Reflection
- node = nodes.new(type='ShaderNodeBsdfRefraction')
- node.label = "Refl BSDF"
- node.location = self._grid_location(6, 1)
- node.mute = True # unmute on use
- self.node_bsdf_refl = node
- del node
- # Link
- links.new(self.node_bsdf_refl.outputs["BSDF"],
- self.node_mix_shader_refl.inputs[1])
-
- # Mix Refl Color
- node = nodes.new(type='ShaderNodeMixRGB')
- node.label = "Mix Color/Refl"
- node.location = self._grid_location(5, 1)
- node.blend_type = 'MULTIPLY'
- node.inputs["Fac"].default_value = 1.0
- # reverse of most other mix nodes
- node.inputs["Color1"].default_value = COLOR_WHITE # color
- node.inputs["Color2"].default_value = COLOR_BLACK # factor
- self.node_mix_color_refl = node
- del node
- # Link
- links.new(self.node_mix_color_refl.outputs["Color"],
- self.node_bsdf_refl.inputs["Color"])
-
- # --------------------------------------------------------------------
- # Alpha
-
- # ----
- # Mix shader
- node = nodes.new(type='ShaderNodeMixShader')
- node.label = "Shader Mix Alpha"
- node.location = self._grid_location(3, 4)
- node.inputs["Fac"].default_value = 1.0 # no alpha by default
- self.node_mix_shader_alpha = node
- del node
- # Link
- links.new(self.node_mix_shader_alpha.outputs["Shader"],
- self.node_mix_shader_spec.inputs[0])
-
- # Alpha BSDF
- node = nodes.new(type='ShaderNodeBsdfTransparent')
- node.label = "Alpha BSDF"
- node.location = self._grid_location(2, 4)
- node.mute = True # unmute on use
- self.node_bsdf_alpha = node
- del node
- # Link
- links.new(self.node_bsdf_alpha.outputs["BSDF"],
- self.node_mix_shader_alpha.inputs[1]) # first 'Shader'
-
- # Mix Alpha Color
- node = nodes.new(type='ShaderNodeMixRGB')
- node.label = "Mix Color/Alpha"
- node.location = self._grid_location(1, 5)
- node.blend_type = 'MULTIPLY'
- node.inputs["Fac"].default_value = 1.0
- node.inputs["Color1"].default_value = COLOR_WHITE
- node.inputs["Color2"].default_value = COLOR_WHITE
- self.node_mix_color_alpha = node
- del node
- # Link
- links.new(self.node_mix_color_alpha.outputs["Color"],
- self.node_mix_shader_alpha.inputs["Fac"])
-
- # --------------------------------------------------------------------
- # Diffuse
-
- # Diffuse BSDF
- node = nodes.new(type='ShaderNodeBsdfDiffuse')
- node.label = "Diff BSDF"
- node.location = self._grid_location(2, 3)
- self.node_bsdf_diff = node
- del node
- # Link
- links.new(self.node_bsdf_diff.outputs["BSDF"],
- self.node_mix_shader_alpha.inputs[2]) # first 'Shader'
-
- # Mix Diffuse Color
- node = nodes.new(type='ShaderNodeMixRGB')
- node.label = "Mix Color/Diffuse"
- node.location = self._grid_location(1, 3)
- node.blend_type = 'MULTIPLY'
- node.inputs["Fac"].default_value = 1.0
- node.inputs["Color1"].default_value = COLOR_WHITE
- node.inputs["Color2"].default_value = COLOR_WHITE
- self.node_mix_color_diff = node
- del node
- # Link
- links.new(self.node_mix_color_diff.outputs["Color"],
- self.node_bsdf_diff.inputs["Color"])
-
- # --------------------------------------------------------------------
- # Specular
- node = nodes.new(type='ShaderNodeBsdfGlossy')
- node.label = "Spec BSDF"
- node.location = self._grid_location(2, 1)
- node.mute = True # unmute on use
- self.node_bsdf_spec = node
- del node
- # Link (with add shader)
- links.new(self.node_bsdf_spec.outputs["BSDF"],
- self.node_mix_shader_spec.inputs[1]) # second 'Shader' slot
-
- node = nodes.new(type='ShaderNodeMixRGB')
- node.label = "Mix Color/Spec"
- node.location = self._grid_location(1, 1)
- node.blend_type = 'MULTIPLY'
- node.inputs["Fac"].default_value = 1.0
- node.inputs["Color1"].default_value = COLOR_WHITE
- node.inputs["Color2"].default_value = COLOR_BLACK
- self.node_mix_color_spec = node
- del node
- # Link
- links.new(self.node_mix_color_spec.outputs["Color"],
- self.node_bsdf_spec.inputs["Color"])
-
- node = nodes.new(type='ShaderNodeMixRGB')
- node.label = "Mix Color/Hardness"
- node.location = self._grid_location(1, 0)
- node.blend_type = 'MULTIPLY'
- node.inputs["Fac"].default_value = 1.0
- node.inputs["Color1"].default_value = COLOR_WHITE
- node.inputs["Color2"].default_value = COLOR_WHITE
- self.node_mix_color_hard = node
- del node
- # Link
- links.new(self.node_mix_color_hard.outputs["Color"],
- self.node_bsdf_spec.inputs["Roughness"])
-
- # --------------------------------------------------------------------
- # Normal Map
- node = nodes.new(type='ShaderNodeNormalMap')
- node.label = "Normal/Map"
- node.location = self._grid_location(1, 2)
- node.mute = True # unmute on use
- self.node_normalmap = node
- del node
-
- # Link (with diff shader)
- socket_src = self.node_normalmap.outputs["Normal"]
- links.new(socket_src,
- self.node_bsdf_diff.inputs["Normal"])
- # Link (with spec shader)
- links.new(socket_src,
- self.node_bsdf_spec.inputs["Normal"])
- # Link (with refl shader)
- links.new(socket_src,
- self.node_bsdf_refl.inputs["Normal"])
- del socket_src
-
- # --------------------------------------------------------------------
- # Bump Map
- # Mix Refl Color
- node = nodes.new(type='ShaderNodeMixRGB')
- node.label = "Bump/Map"
- node.location = self._grid_location(5, 3)
- node.mute = True # unmute on use
- node.blend_type = 'MULTIPLY'
- node.inputs["Fac"].default_value = 1.0
- # reverse of most other mix nodes
- node.inputs["Color1"].default_value = COLOR_WHITE # color
- node.inputs["Color2"].default_value = COLOR_BLACK # factor
- self.node_mix_color_bump = node
- del node
- # Link
- links.new(self.node_mix_color_bump.outputs["Color"],
- self.node_out.inputs["Displacement"])
-
- # --------------------------------------------------------------------
- #
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list