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:
authorDalai Felinto <dfelinto@gmail.com>2018-01-25 16:31:54 +0300
committerDalai Felinto <dfelinto@gmail.com>2018-01-25 16:31:54 +0300
commit748adb37e5a0c4de136fae64e9b1aa41defee3cf (patch)
tree7748703338475df01bd4bf08e59acbaaf4e1ea89 /intern/cycles/blender/addon/version_update.py
parente057d7b9eb3f7641008e2cd77be9691d84433e5d (diff)
parentda4c3f30d984b361d7c00b103ec329d5263779ff (diff)
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'intern/cycles/blender/addon/version_update.py')
-rw-r--r--intern/cycles/blender/addon/version_update.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py
index c105fe9036a..ec334c71555 100644
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@ -360,3 +360,9 @@ def do_versions(self):
if bpy.data.version <= (2, 79, 1) or \
(bpy.data.version >= (2, 80, 0) and bpy.data.version <= (2, 80, 3)):
displacement_nodes_insert()
+
+ if bpy.data.version <= (2, 79, 2):
+ for mat in bpy.data.materials:
+ cmat = mat.cycles
+ if not cmat.is_property_set("displacement_method"):
+ cmat.displacement_method = 'BUMP'