2.5: Remove OOPS code from the outliner space, as discussed

[blender-staging.git] / source / blender / editors / space_outliner / outliner.c

diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c
index 389878f7b6cf3f108a0a5d5445f097da5880da5e..54652587c53b3d4cf56f726651934088f90b83f3 100644 (file)
--- a/source/blender/editors/space_outliner/outliner.c
+++ b/source/blender/editors/space_outliner/outliner.c
@@ -50,7 +50,7 @@
 #include "DNA_modifier_types.h"
 #include "DNA_nla_types.h"
 #include "DNA_object_types.h"
-#include "DNA_oops_types.h"
+#include "DNA_outliner_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
@@ -3063,9 +3063,9 @@ enum {
 static int ed_operator_outliner_datablocks_active(bContext *C)
 {
        ScrArea *sa= CTX_wm_area(C);
-       if ((sa) && (sa->spacetype==SPACE_OOPS)) {
+       if ((sa) && (sa->spacetype==SPACE_OUTLINER)) {
                SpaceOops *so= (SpaceOops *)CTX_wm_space_data(C);
-               return ((so->type == SO_OUTLINER) && (so->outlinevis == SO_DATABLOCKS));
+               return (so->outlinevis == SO_DATABLOCKS);
        }
        return 0;
 }