diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-06 13:19:59 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-07-06 13:21:21 +0300 |
| commit | 9d71ec5f8d8c74d4ae2dbec075d193ac0958de13 (patch) | |
| tree | 2b047bd3dca2e2fec1e6cbd04e69c4b2b9c49ca1 /intern/cycles/blender/addon/properties.py | |
| parent | f67c331bedd5bfd0a70f3d9774cf71c8267f7081 (diff) | |
| parent | a7a5c20fbc8de036992e50f6e399fa041dab7328 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/blender/addon/properties.py')
| -rw-r--r-- | intern/cycles/blender/addon/properties.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 309e44ccbb8..10d47db1e9d 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -697,6 +697,9 @@ class CyclesRenderSettings(bpy.types.PropertyGroup): cls.debug_use_opencl_debug = BoolProperty(name="Debug OpenCL", default=False) + cls.debug_opencl_mem_limit = IntProperty(name="Memory limit", default=0, + description="Artificial limit on OpenCL memory usage in MB (0 to disable limit)") + @classmethod def unregister(cls): del bpy.types.Scene.cycles |