Commit: 66a9698978d9ca1840b782612250ee77490376b3
Author: Thomas Dinges
Date: Fri Feb 5 22:45:36 2016 +0100
Branches: master
https://developer.blender.org/rB66a9698978d9ca1840b782612250ee77490376b3
Cycles: Change several default values (second batch).
This change the following values:
- World settings:
- Use MIS: On
- MIS Samples: 1
- MIS Resolution: 1024
Enabling World MIS per default won't make simple backgrounds (flat background
color) slower,
see previous commit. This gets disabled internally if World MIS is not actually
needed.
===================================================================
M intern/cycles/blender/addon/properties.py
M intern/cycles/blender/addon/version_update.py
M source/blender/blenkernel/BKE_blender.h
===================================================================
diff --git a/intern/cycles/blender/addon/properties.py
b/intern/cycles/blender/addon/properties.py
index f22ac25..81dafb8 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -796,20 +796,20 @@ class CyclesWorldSettings(bpy.types.PropertyGroup):
name="Multiple Importance Sample",
description="Use multiple importance sampling for the
environment, "
"enabling for non-solid colors is recommended",
- default=False,
+ default=True,
)
cls.sample_map_resolution = IntProperty(
name="Map Resolution",
description="Importance map size is resolution x resolution; "
"higher values potentially produce less noise, at
the cost of memory and speed",
min=4, max=8192,
- default=256,
+ default=1024,
)
cls.samples = IntProperty(
name="Samples",
description="Number of light samples to render for each AA
sample",
min=1, max=10000,
- default=4,
+ default=1,
)
cls.max_bounces = IntProperty(
name="Max Bounces",
diff --git a/intern/cycles/blender/addon/version_update.py
b/intern/cycles/blender/addon/version_update.py
index 17b8626..0d34eb2 100644
--- a/intern/cycles/blender/addon/version_update.py
+++ b/intern/cycles/blender/addon/version_update.py
@@ -254,3 +254,19 @@ def do_versions(self):
# Volume Sampling
if not cmat.is_property_set("volume_sampling"):
cmat.volume_sampling = 'DISTANCE'
+
+ if bpy.data.version <= (2, 76, 9):
+ for world in bpy.data.worlds:
+ cworld = world.cycles
+
+ # World MIS
+ if not cworld.is_property_set("sample_as_light"):
+ cworld.sample_as_light = False
+
+ # World MIS Samples
+ if not cworld.is_property_set("samples"):
+ cworld.samples = 4
+
+ # World MIS Resolution
+ if not cworld.is_property_set("sample_map_resolution"):
+ cworld.sample_map_resolution = 256
diff --git a/source/blender/blenkernel/BKE_blender.h
b/source/blender/blenkernel/BKE_blender.h
index 965affa..8d8589c 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -42,7 +42,7 @@ extern "C" {
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 276
-#define BLENDER_SUBVERSION 9
+#define BLENDER_SUBVERSION 10
/* Several breakages with 270, e.g. constraint deg vs rad */
#define BLENDER_MINVERSION 270
#define BLENDER_MINSUBVERSION 6
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
