Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-08-22 23:57:56 +0400
committerThomas Dinges <blender@dingto.org>2013-08-22 23:57:56 +0400
commitfc9d4bdf733b101755a28672c22e5dbb021ae4b8 (patch)
tree9074b42ef3a17eccaca9ac66aa52eb811ccc7abd /release/scripts/presets/cycles
parentda7af1e2719e9813ff1131b84dd268c13b07c8c1 (diff)
Cycles / Sampling UI:
* Add a "Total Samples" info at the bottom of the panel. This makes understanding the Non-Progressive integrator easier, as it displays how many samples are used for the different ray types. * Rename Squared Samples to Square samples, to indicate that the action is not already done. The new Total Samples info should make this easier to understand now as well. Also added back for Progressive integrator, for consistency. Screenshot: http://www.pasteall.org/pic/show.php?id=57980
Diffstat (limited to 'release/scripts/presets/cycles')
-rw-r--r--release/scripts/presets/cycles/sampling/final.py8
-rw-r--r--release/scripts/presets/cycles/sampling/preview.py8
2 files changed, 8 insertions, 8 deletions
diff --git a/release/scripts/presets/cycles/sampling/final.py b/release/scripts/presets/cycles/sampling/final.py
index a76fa352178..2ee429188be 100644
--- a/release/scripts/presets/cycles/sampling/final.py
+++ b/release/scripts/presets/cycles/sampling/final.py
@@ -1,13 +1,13 @@
import bpy
cycles = bpy.context.scene.cycles
-cycles.squared_samples = True
+cycles.use_square_samples = True
# Progressive
-cycles.samples = 500
-cycles.preview_samples = 100
+cycles.samples = 24
+cycles.preview_samples = 12
-# Non-Progressive (squared)
+# Non-Progressive
cycles.aa_samples = 8
cycles.preview_aa_samples = 4
diff --git a/release/scripts/presets/cycles/sampling/preview.py b/release/scripts/presets/cycles/sampling/preview.py
index 3f565ccff8c..c7af6c83777 100644
--- a/release/scripts/presets/cycles/sampling/preview.py
+++ b/release/scripts/presets/cycles/sampling/preview.py
@@ -1,13 +1,13 @@
import bpy
cycles = bpy.context.scene.cycles
-cycles.squared_samples = True
+cycles.use_square_samples = True
# Progressive
-cycles.samples = 100
-cycles.preview_samples = 10
+cycles.samples = 12
+cycles.preview_samples = 6
-# Non-Progressive (squared)
+# Non-Progressive
cycles.aa_samples = 4
cycles.preview_aa_samples = 2