Merge branch 'blender2.7'

intern/cycles/blender/addon/properties.py

@@ -889,7 +889,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

intern/cycles/blender/addon/version_update.py

@@ -461,3 +461,11 @@ def do_versions(self):
                     cworld.sampling_method = 'NONE'
 
         ambient_occlusion_nodes_relink()
+
+    if bpy.data.version <= (2, 79, 6) or \
+       (bpy.data.version >= (2, 80, 0) and bpy.data.version <= (2, 80, 41)):
+        # 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'

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         280
-#define BLENDER_SUBVERSION      41
+#define BLENDER_SUBVERSION      42
 /* Several breakages with 280, e.g. collections vs layers */
 #define BLENDER_MINVERSION      280
 #define BLENDER_MINSUBVERSION   0