X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fscene.h;h=a8c8e6a1524069a2cadad9128f82ea0c1bc09e90;hp=acabd10172c5bab23d107eb4f4d9e86f856fe38d;hb=d4d7f73284783d2a50d71014789d196bef7d0e0e;hpb=e8fe498f52ff5f3c87759623ce94726af0ef2890

diff --git a/src/scene.h b/src/scene.h
index acabd10..a8c8e6a 100644
--- a/src/scene.h
+++ b/src/scene.h
@@ -36,6 +36,9 @@ public:
 
 	bool load(const char *fname, unsigned int flags = 0);
 
+	// merge scn into this scene, leaving scn empty and safe to destroy
+	bool merge(Scene *scn);
+
 	void add_object(Object *obj);
 	bool remove_object(Object *obj);
 	bool have_object(Object *obj) const;