[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39600] branches/soc-2011-pepper/release/ scripts/startup/bl_ui/space_dopesheet.py: Bugfix: "Filters" toggle was being shown in Action Editor too, where

[Joshua Leung]

Revision: 39600
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39600
Author:   aligorith
Date:     2011-08-22 02:30:43 +0000 (Mon, 22 Aug 2011)
Log Message:
-----------
Bugfix: "Filters" toggle was being shown in Action Editor too, where
it was irrelevant

Modified Paths:
--------------
    branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_dopesheet.py

Modified: branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_dopesheet.py
===================================================================
--- branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_dopesheet.py	2011-08-22 02:14:39 UTC (rev 39599)
+++ branches/soc-2011-pepper/release/scripts/startup/bl_ui/space_dopesheet.py	2011-08-22 02:30:43 UTC (rev 39600)
@@ -50,40 +50,41 @@
         if dopesheet.show_only_matching_fcurves:
             row.prop(dopesheet, "filter_fcurve_name", text="")
 
-    row = layout.row(align=True)
-    row.prop(dopesheet, "show_datablock_filters", text="Filters")
+    if not genericFiltersOnly:
+        row = layout.row(align=True)
+        row.prop(dopesheet, "show_datablock_filters", text="Filters")
 
-    if (not genericFiltersOnly) and (dopesheet.show_datablock_filters):
-        row.prop(dopesheet, "show_scenes", text="")
-        row.prop(dopesheet, "show_worlds", text="")
-        row.prop(dopesheet, "show_nodes", text="")
+        if dopesheet.show_datablock_filters:
+            row.prop(dopesheet, "show_scenes", text="")
+            row.prop(dopesheet, "show_worlds", text="")
+            row.prop(dopesheet, "show_nodes", text="")
 
-        row.prop(dopesheet, "show_transforms", text="")
+            row.prop(dopesheet, "show_transforms", text="")
 
-        if bpy.data.meshes:
-            row.prop(dopesheet, "show_meshes", text="")
-        if bpy.data.shape_keys:
-            row.prop(dopesheet, "show_shapekeys", text="")
-        if bpy.data.materials:
-            row.prop(dopesheet, "show_materials", text="")
-        if bpy.data.lamps:
-            row.prop(dopesheet, "show_lamps", text="")
-        if bpy.data.textures:
-            row.prop(dopesheet, "show_textures", text="")
-        if bpy.data.cameras:
-            row.prop(dopesheet, "show_cameras", text="")
-        if bpy.data.curves:
-            row.prop(dopesheet, "show_curves", text="")
-        if bpy.data.metaballs:
-            row.prop(dopesheet, "show_metaballs", text="")
-        if bpy.data.lattices:
-            row.prop(dopesheet, "show_lattices", text="")
-        if bpy.data.armatures:
-            row.prop(dopesheet, "show_armatures", text="")
-        if bpy.data.particles:
-            row.prop(dopesheet, "show_particles", text="")
-        if bpy.data.speakers:
-            row.prop(dopesheet, "show_speakers", text="")
+            if bpy.data.meshes:
+                row.prop(dopesheet, "show_meshes", text="")
+            if bpy.data.shape_keys:
+                row.prop(dopesheet, "show_shapekeys", text="")
+            if bpy.data.materials:
+                row.prop(dopesheet, "show_materials", text="")
+            if bpy.data.lamps:
+                row.prop(dopesheet, "show_lamps", text="")
+            if bpy.data.textures:
+                row.prop(dopesheet, "show_textures", text="")
+            if bpy.data.cameras:
+                row.prop(dopesheet, "show_cameras", text="")
+            if bpy.data.curves:
+                row.prop(dopesheet, "show_curves", text="")
+            if bpy.data.metaballs:
+                row.prop(dopesheet, "show_metaballs", text="")
+            if bpy.data.lattices:
+                row.prop(dopesheet, "show_lattices", text="")
+            if bpy.data.armatures:
+                row.prop(dopesheet, "show_armatures", text="")
+            if bpy.data.particles:
+                row.prop(dopesheet, "show_particles", text="")
+            if bpy.data.speakers:
+                row.prop(dopesheet, "show_speakers", text="")
 
 
 #######################################