[Bf-blender-cvs] [0ff968eaf56] blender2.8: Fix Cycles inserting displacement node when there is a custom node setup instead.

[Brecht Van Lommel]

Commit: 0ff968eaf56830d19366e060b149dc32185bc063
Author: Brecht Van Lommel
Date:   Wed Jan 24 07:08:36 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB0ff968eaf56830d19366e060b149dc32185bc063

Fix Cycles inserting displacement node when there is a custom node setup instead.

===================================================================

M	intern/cycles/blender/addon/version_update.py

===================================================================

diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py
index 2075bdba8c5..c105fe9036a 100644
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@ -357,5 +357,6 @@ def do_versions(self):
             if not cscene.is_property_set("sample_clamp_indirect"):
                 cscene.sample_clamp_indirect = 0.0
 
-    if bpy.data.version <= (2, 80, 3):
+    if bpy.data.version <= (2, 79, 1) or \
+       (bpy.data.version >= (2, 80, 0) and bpy.data.version <= (2, 80, 3)):
         displacement_nodes_insert()