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

[blender-staging.git] / source / blender / editors / screen / screen_ops.c

diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 076f871c4c27ff2324f85308482a1b0edd428136..ff0a89b9e1c2068968c99c064d2a7301d642c773 100644 (file)
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -134,11 +134,7 @@ int ED_operator_timeline_active(bContext *C)
 
 int ED_operator_outliner_active(bContext *C)
 {
 
 int ED_operator_outliner_active(bContext *C)
 {

-       if(ed_spacetype_test(C, SPACE_OOPS)) {
-               SpaceOops *so= (SpaceOops *)CTX_wm_space_data(C);
-               return (so->type == SO_OUTLINER);
-       }
-       return 0;
+       return ed_spacetype_test(C, SPACE_OUTLINER);

 }
 
 int ED_operator_file_active(bContext *C)
 }
 
 int ED_operator_file_active(bContext *C)