[Bf-blender-cvs] [64aa5bb] blender-v2.72-release: Fix T42262: Ocean texture options cannot be edited while in Cycles

Bastien Montagne noreply at git.blender.org
Tue Oct 21 12:14:35 CEST 2014


Commit: 64aa5bb6911b16acc238e2e8ef213caf9a05ec96
Author: Bastien Montagne
Date:   Thu Oct 16 23:02:23 2014 +0200
Branches: blender-v2.72-release
https://developer.blender.org/rB64aa5bb6911b16acc238e2e8ef213caf9a05ec96

Fix T42262: Ocean texture options cannot be edited while in Cycles

===================================================================

M	release/scripts/startup/bl_ui/properties_texture.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py
index faf0d4c..f257c89 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




More information about the Bf-blender-cvs mailing list