[Bf-blender-cvs] [3a527357a55] blender2.7: Cycles: change default displacement method to bump mapping again.

[Brecht Van Lommel]

Commit: 3a527357a556491406ee9d33a79ab0af5f79e326
Author: Brecht Van Lommel
Date:   Thu Jan 24 15:15:57 2019 +0100
Branches: blender2.7
https://developer.blender.org/rB3a527357a556491406ee9d33a79ab0af5f79e326

Cycles: change default displacement method to bump mapping again.

Even though it makes sense logically to have displacement actually displace
the mesh, this is causing a lot of confusion for existing users that are used
to the previous behavior. Further, since Eevee does not support displacement
yet and the discrepancy between the viewport and final render is problematic.

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

M	intern/cycles/blender/addon/properties.py
M	intern/cycles/blender/addon/version_update.py
M	source/blender/blenkernel/BKE_blender_version.h

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

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 3f17d53fda7..9d00a3f75b8 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -892,7 +892,7 @@ class CyclesMaterialSettings(bpy.types.PropertyGroup):
             name="Displacement Method",
             description="Method to use for the displacement",
             items=enum_displacement_methods,
-            default='DISPLACEMENT',
+            default='BUMP',
         )
 
     @classmethod
diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py
index f14fe9abc3d..3a4b13ef9d2 100644
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@ -489,3 +489,10 @@ def do_versions(self):
                     cworld.sampling_method = 'NONE'
 
         ambient_occlusion_nodes_relink()
+
+    if bpy.data.version <= (2, 79, 6):
+        # Change default to bump again.
+        for mat in bpy.data.materials:
+            cmat = mat.cycles
+            if not cmat.is_property_set("displacement_method"):
+                cmat.displacement_method = 'DISPLACEMENT'
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
index 16115203294..7cd023f89f5 100644
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@ -28,7 +28,7 @@
  * and keep comment above the defines.
  * Use STRINGIFY() rather than defining with quotes */
 #define BLENDER_VERSION         279
-#define BLENDER_SUBVERSION      6
+#define BLENDER_SUBVERSION      7
 /* Several breakages with 270, e.g. constraint deg vs rad */
 #define BLENDER_MINVERSION      270
 #define BLENDER_MINSUBVERSION   6