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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2011-12-01 20:33:21 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2011-12-01 20:33:21 +0400
commit45de38077131b248eb52ab1863072750252a85e2 (patch)
treeae04201f8c6600b65974d252075f0dd020423c20 /intern/cycles/blender/addon/enums.py
parentf6f7e270e30946d0bb3ea4d5c556c994125e590f (diff)
Cycles
* Compile all of cycles with -ffast-math again * Add scons compilation of cuda binaries, tested on mac/linux. * Add UI option for supported/experimental features, to make it more clear what is supported, opencl/subdivision is experimental. * Remove cycles xml exporter, was just for testing.
Diffstat (limited to 'intern/cycles/blender/addon/enums.py')
-rw-r--r--intern/cycles/blender/addon/enums.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/enums.py b/intern/cycles/blender/addon/enums.py
index 581dc08436a..a11f5ca0f87 100644
--- a/intern/cycles/blender/addon/enums.py
+++ b/intern/cycles/blender/addon/enums.py
@@ -41,7 +41,12 @@ devices = (
gpu_type = (
("CUDA", "CUDA", "NVidia only"),
- ("OPENCL", "OpenCL (incomplete)", ""),
+ ("OPENCL", "OpenCL", ""),
+ )
+
+feature_set = (
+ ("SUPPORTED", "Supported", "Only use finished and supported features"),
+ ("EXPERIMENTAL", "Experimental", "Use experimental and incomplete features that might be broken or change in the future"),
)
shading_systems = (