Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 24 Jan 2019 14:44:06 +0000 (15:44 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 24 Jan 2019 14:44:06 +0000 (15:44 +0100)
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/version_update.py
source/blender/blenkernel/BKE_blender_version.h

index 9cbb2e86369ddd76b731ae3ff32c7fb42b650768..97f03800d2cd1047663e544e1e905f63d1f968df 100644 (file)
@@ -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
index c61972da6e63749e12eebf1192b7fb2368384d36..178f1162568f5957f10cb3cb550f6f789469f98b 100644 (file)
@@ -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'
index 25daceab13dbf0be442a8a2b3121b2de0b848ceb..8924a9389116dce4a02350bc45c020c308eb2bb8 100644 (file)
@@ -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