diff options
| author | Thomas Dinges <blender@dingto.org> | 2014-10-17 01:27:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-21 14:14:26 +0400 |
| commit | cb95673c92d18640bc7e5ecdffb0db15852c39c2 (patch) | |
| tree | bd9b03d2bf9be4aae52a7edb35f12aa3c5758459 | |
| parent | 64aa5bb6911b16acc238e2e8ef213caf9a05ec96 (diff) | |
Different fix for T42262, we don't put Cycles compat into regular bl_ui files.
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 1 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_texture.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 9632b12c414..10c604dad9b 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -1436,6 +1436,7 @@ def get_panels(): "TEXTURE_PT_pointdensity", "TEXTURE_PT_pointdensity_turbulence", "TEXTURE_PT_mapping", + "TEXTURE_PT_ocean", "TEXTURE_PT_influence", "TEXTURE_PT_colors", "PARTICLE_PT_context_particles", diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index f257c89d7ca..faf0d4cb0e8 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', 'CYCLES'} + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): layout = self.layout |