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

this can be brought back as a new space if someone decides to
work on it.

This also fixes remaining issues with the outliner tree open
and close buttons not working sometimes.

3 files changed, 7 insertions, 68 deletions

diff --git a/source/blender/makesdna/DNA_oops_types.h b/source/blender/makesdna/DNA_outliner_types.h
index 0a6b1a45b11..b19db15d73b 100644
--- a/source/blender/makesdna/DNA_oops_types.h
+++ b/source/blender/makesdna/DNA_outliner_types.h
@@ -1,6 +1,4 @@
 /**
- * blenlib/DNA_oops_types.h (mar-2001 nzc)
- *	
  * $Id$ 
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -28,11 +26,8 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
-#ifndef DNA_OOPS_TYPES_H
-#define DNA_OOPS_TYPES_H
-
-#define OOPSX	5.0
-#define OOPSY	1.8
+#ifndef DNA_OUTLINER_TYPES_H
+#define DNA_OUTLINER_TYPES_H
 
 #include "DNA_listBase.h"
 
@@ -48,30 +43,6 @@ typedef struct TreeStore {
 	TreeStoreElem *data;
 } TreeStore;
 
-typedef struct Oops {
-	struct Oops *next, *prev;
-	short type, flag, dt, hide;
-	float x, y;		/* left - bottom */
-	float dx, dy;	/* shuffle */
-	struct ID *id;
-	ListBase link;
-} Oops;
-
-#
-#
-typedef struct OopsLink {
-	struct OopsLink *next, *prev;
-	short type, flag;
-	struct ID **idfrom;
-	Oops *to, *from;	/* from is for temp */
-	float xof, yof;
-	char name[12];
-} OopsLink;
-
-/* oops->flag  (1==SELECT) */
-#define OOPS_DOSELECT	2
-#define OOPS_REFER		4
-
 /* TreeStoreElem->flag */
 #define TSE_CLOSED		1
 #define TSE_SELECTED	2
diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h
index d4dffddcdcc..8a26a216e79 100644
--- a/source/blender/makesdna/DNA_space_types.h
+++ b/source/blender/makesdna/DNA_space_types.h
@@ -33,7 +33,7 @@
 
 #include "DNA_listBase.h"
 #include "DNA_vec_types.h"
-#include "DNA_oops_types.h"		/* for TreeStoreElem */
+#include "DNA_outliner_types.h"		/* for TreeStoreElem */
 #include "DNA_image_types.h"	/* ImageUser */
 /* Hum ... Not really nice... but needed for spacebuts. */
 #include "DNA_view2d_types.h"
@@ -194,10 +194,6 @@ typedef struct SpaceOops {
 
 	View2D v2d; /* depricated, copied to region */
 	
-	ListBase oops;
-	short pin, visiflag, flag, rt;
-	void *lockpoin;
-	
 	ListBase tree;
 	struct TreeStore *treestore;
 	
@@ -206,12 +202,7 @@ typedef struct SpaceOops {
 	struct TreeStoreElem search_tse;
 	int search_flags, do_;
 	
-	short type, outlinevis, storeflag;
-	short deps_flags;
-
-	/* RNA */
-	char *rnapath;
-	
+	short flag, outlinevis, storeflag, pad;
 } SpaceOops;
 
 typedef struct SpaceImage {
@@ -609,35 +600,12 @@ enum {
 /* stext->findstr/replacestr */
 #define ST_MAX_FIND_STR		256
 
-/* SpaceOops->type */
-#define SO_OOPS			0
-#define SO_OUTLINER		1
-#define SO_DEPSGRAPH    2
-
 /* SpaceOops->flag */
 #define SO_TESTBLOCKS	1
 #define SO_NEWSELECTED	2
 #define SO_HIDE_RESTRICTCOLS		4
 #define SO_HIDE_KEYINGSETINFO		8
 
-/* SpaceOops->visiflag */
-#define OOPS_SCE	1
-#define OOPS_OB		2
-#define OOPS_ME		4
-#define OOPS_CU		8
-#define OOPS_MB		16
-#define OOPS_LT		32
-#define OOPS_LA		64
-#define OOPS_MA		128
-#define OOPS_TE		256
-#define OOPS_IP		512
-#define OOPS_LAY	1024
-#define OOPS_LI		2048
-#define OOPS_IM		4096
-#define OOPS_AR		8192
-#define OOPS_GR		16384
-#define OOPS_CA		32768
-
 /* SpaceOops->outlinevis */
 #define SO_ALL_SCENES	0
 #define SO_CUR_SCENE	1
@@ -738,7 +706,7 @@ enum {
 	SPACE_EMPTY,
 	SPACE_VIEW3D,
 	SPACE_IPO,
-	SPACE_OOPS,
+	SPACE_OUTLINER,
 	SPACE_BUTS,
 	SPACE_FILE,
 	SPACE_IMAGE,		
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index 17547c4eb1d..bf2f0f3900e 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -111,7 +111,7 @@ char *includefiles[] = {
 	"DNA_fileglobal_types.h",
 	"DNA_sequence_types.h",
 	"DNA_effect_types.h",
-	"DNA_oops_types.h",
+	"DNA_outliner_types.h",
 	"DNA_property_types.h",
 	"DNA_sensor_types.h",
 	"DNA_controller_types.h",
@@ -1135,7 +1135,7 @@ int main(int argc, char ** argv)
 #include "DNA_fileglobal_types.h"
 #include "DNA_sequence_types.h"
 #include "DNA_effect_types.h"
-#include "DNA_oops_types.h"
+#include "DNA_outliner_types.h"
 #include "DNA_property_types.h"
 #include "DNA_sensor_types.h"
 #include "DNA_controller_types.h"