Merge branch 'blender2.7'
[blender.git] / intern / cycles / blender / addon / properties.py
index 9cbb2e8..97f0380 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