diff options
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/addon/properties.py | 2 | ||||
| -rw-r--r-- | intern/cycles/blender/addon/version_update.py | 7 |
2 files changed, 8 insertions, 1 deletions
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' |