[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52926] trunk/blender/source/blender/ editors/interface/interface_layout.c: Fix for menu context.

[Lukas Toenne]

Revision: 52926
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52926
Author:   lukastoenne
Date:     2012-12-12 12:50:49 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
Fix for menu context. The menu draw function context did not inherit the custom context storage from the original uiLayout yet. Fix by Campbell Barton (ideasman_42).

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_layout.c

Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_layout.c	2012-12-12 12:50:45 UTC (rev 52925)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c	2012-12-12 12:50:49 UTC (rev 52926)
@@ -1466,7 +1466,13 @@
 		printf("%s: opening menu \"%s\"\n", __func__, mt->idname);
 	}
 
+	if (layout->context)
+		CTX_store_set(C, layout->context);
+
 	mt->draw(C, &menu);
+
+	if (layout->context)
+		CTX_store_set(C, NULL);
 }
 
 static void ui_item_menu(uiLayout *layout, const char *name, int icon, uiMenuCreateFunc func, void *arg, void *argN, const char *tip)