diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-24 17:44:06 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-01-24 17:44:06 +0300 |
| commit | 8be7ed140896e05b33c580f414a282a25738269b (patch) | |
| tree | 2717f0e1f9616531a7866ac6f8ebd4431accf282 /intern | |
| parent | 5fc4214adaaa8d13bc5f2d5d45ee9a814b672e04 (diff) | |
| parent | 3a527357a556491406ee9d33a79ab0af5f79e326 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/addon/properties.py | 2 | ||||
| -rw-r--r-- | intern/cycles/blender/addon/version_update.py | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 9cbb2e86369..97f03800d2c 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/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 diff --git a/intern/cycles/blender/addon/version_update.py b/intern/cycles/blender/addon/version_update.py index c61972da6e6..178f1162568 100644 --- a/intern/cycles/blender/addon/version_update.py +++ b/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' |