[Bf-blender-cvs] [8be7ed14089] master: Merge branch 'blender2.7'
Brecht Van Lommel
noreply at git.blender.org
Thu Jan 24 15:44:38 CET 2019
Commit: 8be7ed140896e05b33c580f414a282a25738269b
Author: Brecht Van Lommel
Date: Thu Jan 24 15:44:06 2019 +0100
Branches: master
https://developer.blender.org/rB8be7ed140896e05b33c580f414a282a25738269b
Merge branch 'blender2.7'
===================================================================
===================================================================
diff --cc intern/cycles/blender/addon/properties.py
index 9cbb2e86369,9d00a3f75b8..97f03800d2c
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@@ -851,47 -848,6 +851,47 @@@ class CyclesCameraSettings(bpy.types.Pr
class CyclesMaterialSettings(bpy.types.PropertyGroup):
+
+ sample_as_light: BoolProperty(
+ name="Multiple Importance Sample",
+ description="Use multiple importance sampling for this material, "
+ "disabling may reduce overall noise for large "
+ "objects that emit little light compared to other light sources",
+ default=True,
+ )
+ use_transparent_shadow: BoolProperty(
+ name="Transparent Shadows",
+ description="Use transparent shadows for this material if it contains a Transparent BSDF, "
+ "disabling will render faster but not give accurate shadows",
+ default=True,
+ )
+ homogeneous_volume: BoolProperty(
+ name="Homogeneous Volume",
+ description="When using volume rendering, assume volume has the same density everywhere "
+ "(not using any textures), for faster rendering",
+ default=False,
+ )
+ volume_sampling: EnumProperty(
+ name="Volume Sampling",
+ description="Sampling method to use for volumes",
+ items=enum_volume_sampling,
+ default='MULTIPLE_IMPORTANCE',
+ )
+
+ volume_interpolation: EnumProperty(
+ name="Volume Interpolation",
+ description="Interpolation method to use for smoke/fire volumes",
+ items=enum_volume_interpolation,
+ default='LINEAR',
+ )
+
+ displacement_method: EnumProperty(
+ name="Displacement Method",
+ description="Method to use for the displacement",
+ items=enum_displacement_methods,
- default='DISPLACEMENT',
++ default='BUMP',
+ )
+
@classmethod
def register(cls):
bpy.types.Material.cycles = PointerProperty(
diff --cc intern/cycles/blender/addon/version_update.py
index c61972da6e6,3a4b13ef9d2..178f1162568
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@@ -461,3 -489,10 +461,11 @@@ def do_versions(self)
cworld.sampling_method = 'NONE'
ambient_occlusion_nodes_relink()
+
- if bpy.data.version <= (2, 79, 6):
++ 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'
diff --cc source/blender/blenkernel/BKE_blender_version.h
index 25daceab13d,7cd023f89f5..8924a938911
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@@ -27,11 -27,11 +27,11 @@@
/* these lines are grep'd, watch out for our not-so-awesome regex
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
-#define BLENDER_VERSION 279
-#define BLENDER_SUBVERSION 7
-/* Several breakages with 270, e.g. constraint deg vs rad */
-#define BLENDER_MINVERSION 270
-#define BLENDER_MINSUBVERSION 6
+#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
/* used by packaging tools */
/* can be left blank, otherwise a,b,c... etc with no quotes */
More information about the Bf-blender-cvs
mailing list