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:
authorBastien Montagne <montagne29@wanadoo.fr>2014-10-17 01:02:23 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2014-10-17 01:02:23 +0400
commitb28aa182f3483ca467105505834eabf2eaa5a51a (patch)
tree67ed76523335c7f80734a6444c978f0c908518dd /release
parent8f1e015d7596293aa4c99812c6690588d2d23a5d (diff)
Fix T42262: Ocean texture options cannot be edited while in Cycles
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_texture.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py
index faf0d4cb0e8..f257c89d7ca 100644
--- a/release/scripts/startup/bl_ui/properties_texture.py
+++ b/release/scripts/startup/bl_ui/properties_texture.py
@@ -893,7 +893,7 @@ class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel, Panel):
class TEXTURE_PT_ocean(TextureTypePanel, Panel):
bl_label = "Ocean"
tex_type = 'OCEAN'
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME', 'CYCLES'}
def draw(self, context):
layout = self.layout