Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-02-03 18:10:01 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-02-03 18:10:01 +0300
commit1bc0cd00713a573bed76ab35b6ae0cc0e9edc307 (patch)
treea24e6f88aee2a999b187dd416bef941af6450677 /intern/cycles/blender/addon/version_update.py
parent065a84c8d0d68edece9a407dbe97828fe22d3a6f (diff)
parentdb989e1f118071aae6dcd9f29d10182bd5ebed0b (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender/addon/version_update.py')
-rw-r--r--intern/cycles/blender/addon/version_update.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py
index ec334c71555..12f1cec4ac9 100644
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@ -119,6 +119,7 @@ def displacement_node_insert(material, nodetree, traversed):
node.location[0] = 0.5 * (from_node.location[0] + to_node.location[0]);
node.location[1] = 0.5 * (from_node.location[1] + to_node.location[1]);
node.inputs['Scale'].default_value = 0.1
+ node.inputs['Midlevel'].default_value = 0.0
nodetree.links.new(from_socket, node.inputs['Height'])
nodetree.links.new(node.outputs['Displacement'], to_socket)
@@ -129,6 +130,11 @@ def displacement_nodes_insert():
if check_is_new_shading_material(material):
displacement_node_insert(material, material.node_tree, traversed)
+def displacement_node_space(node):
+ if node.bl_idname == 'ShaderNodeDisplacement':
+ if node.space != 'WORLD':
+ node.space = 'OBJECT'
+
def mapping_node_order_flip(node):
"""
@@ -366,3 +372,5 @@ def do_versions(self):
cmat = mat.cycles
if not cmat.is_property_set("displacement_method"):
cmat.displacement_method = 'BUMP'
+
+ foreach_cycles_node(displacement_node_space)