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

[blender-staging.git] / source / blender / blenkernel / intern / object.c

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 249f67367f418726ff0348164cc6be89b58fde75..5e0c574014384abd7a7f150ed0c180de9d43c640 100644 (file)
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -58,7 +58,7 @@
 #include "DNA_object_types.h"
 #include "DNA_object_force.h"
 #include "DNA_object_fluidsim.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"
@@ -554,15 +554,9 @@ void unlink_object(Scene *scene, Object *ob)
                                                // XXX if(v3d->localvd->persp==V3D_CAMOB) v3d->localvd->persp= V3D_PERSP;
                                        }
                                }
-                               else if(sl->spacetype==SPACE_OOPS) {
+                               else if(sl->spacetype==SPACE_OUTLINER) {
                                        SpaceOops *so= (SpaceOops *)sl;
-                                       Oops *oops;
 
-                                       oops= so->oops.first;
-                                       while(oops) {
-                                               if(oops->id==(ID *)ob) oops->id= NULL;
-                                               oops= oops->next;
-                                       }
                                        if(so->treestore) {
                                                TreeStoreElem *tselem= so->treestore->data;
                                                int a;
@@ -570,7 +564,6 @@ void unlink_object(Scene *scene, Object *ob)
                                                        if(tselem->id==(ID *)ob) tselem->id= NULL;
                                                }
                                        }
-                                       so->lockpoin= NULL;
                                }
                        }