Added global delete, triggered with Shift+Del, this removes the object from all scenes (saves searching manually)

2 files changed, 31 insertions, 4 deletions

diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c
index 55bfa4d3d46..6f0d3c2971a 100644
--- a/source/blender/src/editobject.c
+++ b/source/blender/src/editobject.c
@@ -255,6 +255,10 @@ void delete_obj(int ok)
 	Base *base;
 	int islamp= 0;
 	
+	/* used for global delete only*/
+	Scene *scene; 
+	Base *base_other;
+	
 	if(G.obedit) return;
 	if(G.scene->id.lib) return;
 	
@@ -262,12 +266,35 @@ void delete_obj(int ok)
 	while(base) {
 		Base *nbase= base->next;
 
-		if TESTBASE(base) {
-			if(ok==0 &&  (ok=okee("Erase selected Object(s)"))==0) return;
+		if TESTBASE(base) { 
+			if(ok==0) {
+				/* Shift Del is global delete */
+				if (G.qual & LR_SHIFTKEY) {
+					if(!okee("Erase selected Object(s) Globally")) return;
+					ok= 2;
+				} else {
+					if(!okee("Erase selected Object(s)")) return;
+					ok= 1;
+				}
+			}
+			
 			if(base->object->type==OB_LAMP) islamp= 1;
 #ifdef WITH_VERSE
 			if(base->object->vnode) b_verse_delete_object(base->object);
-#endif			
+#endif
+			if (ok==2) {
+				for (scene= G.main->scene.first; scene; scene= scene->id.next) {
+					if (scene != G.scene && !(scene->id.lib)) {
+						base_other= object_in_scene( base->object, scene );
+						if (base_other) {
+							if (base_other == scene->basact) scene->basact= NULL;	/* in case the object was active */
+							free_and_unlink_base_from_scene( scene, base_other );
+						}
+					}
+				}
+			}
+			
+			/* remove from current scene only */
 			free_and_unlink_base(base);
 		}
 		
diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index ddcc5c83361..ccf80c3e910 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -1935,7 +1935,7 @@ static void winqreadview3dspace(ScrArea *sa, void *spacedata, BWinEvent *evt)
 				break;
 			case XKEY:
 			case DELKEY:
-				if(G.qual==0)
+				if(G.qual==0 || G.qual==LR_SHIFTKEY)
 					delete_context_selected();
 				break;
 			case YKEY: