2.5: Remove OOPS code from the outliner space, as discussed
[blender-staging.git] / source / blender / blenloader / intern / writefile.c
index 2aa87883fdbfd280b1b365105bc8f06780aecf11..1c9c5cad19f17859b5b9b06809c3c1ad676b72df 100644 (file)
@@ -121,7 +121,7 @@ Any case: direct data is ALWAYS after the lib block
 #include "DNA_node_types.h"
 #include "DNA_object_types.h"
 #include "DNA_object_force.h"
-#include "DNA_oops_types.h"
+#include "DNA_outliner_types.h"
 #include "DNA_packedFile_types.h"
 #include "DNA_particle_types.h"
 #include "DNA_property_types.h"
@@ -1820,29 +1820,11 @@ static void write_screens(WriteData *wd, ListBase *scrbase)
                                        writestruct(wd, DATA, "SpaceSeq", 1, sl);
                                        if(sseq->gpd) write_gpencil(wd, sseq->gpd);
                                }
-                               else if(sl->spacetype==SPACE_OOPS) {
+                               else if(sl->spacetype==SPACE_OUTLINER) {
                                        SpaceOops *so= (SpaceOops *)sl;
-                                       Oops *oops;
                                        
-                                       /* cleanup */
-                                       oops= so->oops.first;
-                                       while(oops) {
-                                               Oops *oopsn= oops->next;
-                                               if(oops->id==0) {
-                                                       BLI_remlink(&so->oops, oops);
-// XXX                                                 free_oops(oops);
-                                               }
-                                               oops= oopsn;
-                                       }
-                                       
-                                       /* ater cleanup, because of listbase! */
                                        writestruct(wd, DATA, "SpaceOops", 1, so);
-                                       
-                                       oops= so->oops.first;
-                                       while(oops) {
-                                               writestruct(wd, DATA, "Oops", 1, oops);
-                                               oops= oops->next;
-                                       }
+
                                        /* outliner */
                                        if(so->treestore) {
                                                writestruct(wd, DATA, "TreeStore", 1, so->treestore);