3 files changed, 18 insertions, 1 deletions
diff --git a/Gem/develop/include/Gem/Base/CPPExtern.h b/Gem/develop/include/Gem/Base/CPPExtern.h
index 0350681..ddacc54 100644
--- a/Gem/develop/include/Gem/Base/CPPExtern.h
+++ b/Gem/develop/include/Gem/Base/CPPExtern.h
@@ -122,6 +122,12 @@ class GEM_EXTERN CPPExtern
     	// Creation callback
     	static void 	real_obj_setupCallback(t_class *) {}
 
+	///////////
+	// called directly before the destructor
+	// normally you should not override this (use the dtor!)
+	// if you do override this, make sure that you call the parent as well
+	virtual void beforeDeletion();
+
     private:
 
       //////////
@@ -157,7 +163,9 @@ class GEM_EXTERN CPPExtern
 #define CPPEXTERN_HEADER(NEW_CLASS, PARENT_CLASS)    	    	\
 public:     	    	    	    	    	    	    	\
 static void obj_freeCallback(void *data)    	    	    	\
-{ CPPExtern *mydata = ((Obj_header *)data)->data; delete mydata; \
+{ CPPExtern *mydata = ((Obj_header *)data)->data;		\
+  GetMyClass(data)->beforeDeletion();				\
+  delete mydata;						\
   ((Obj_header *)data)->Obj_header::~Obj_header(); }   	    	\
 static void real_obj_setupCallback(t_class *classPtr)  	    	\
 { PARENT_CLASS::real_obj_setupCallback(classPtr);    	    	\
diff --git a/Gem/develop/include/Gem/Base/GemBase.h b/Gem/develop/include/Gem/Base/GemBase.h
index 09e6a8f..9b0d362 100644
--- a/Gem/develop/include/Gem/Base/GemBase.h
+++ b/Gem/develop/include/Gem/Base/GemBase.h
@@ -128,6 +128,8 @@ class GEM_EXTERN GemBase : public CPPExtern
 
  protected:
   enum RenderState getState(void);
+
+  virtual void beforeDeletion(void);
 };
 
 #endif	// for header file
diff --git a/Gem/develop/include/Gem/Base/GemWindow.h b/Gem/develop/include/Gem/Base/GemWindow.h
index c5105c4..18ad28f 100644
--- a/Gem/develop/include/Gem/Base/GemWindow.h
+++ b/Gem/develop/include/Gem/Base/GemWindow.h
@@ -30,6 +30,7 @@ DESCRIPTION
 namespace gem {
   class Context;
 };
+class GemBase;
 
 class GEM_EXTERN GemWindow : public CPPExtern
 {
@@ -86,6 +87,12 @@ class GEM_EXTERN GemWindow : public CPPExtern
    */
   static gem::Context*destroyContext(gem::Context*);
 
+  /*
+   * call stopRendering() of a given objects for all valid contexts
+   * (this will make each context current, call obj->stopRendering and switch back to the original context)
+   */
+  static void stopInAllContexts(GemBase*obj);
+
   /* this MUST be called from the derived classes
    * as it will eventually establish a new GemContext (if m_context is non-NULL)
    * if you want to share GemContext's you MUST call