diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 07:44:50 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 07:44:50 +0400 |
| commit | 5caf6e9070ce3694b62be9b8599f93d063470dd6 (patch) | |
| tree | 69e00a915ba7562a979b0ff4de8f10e30411d6cc /source/blender/editors/screen/screen_context.c | |
| parent | 08cc1c6bb96084bcd9e70b19edf9048fffe1fd3d (diff) | |
presets now work from non-redo popups,
ended up having to add a new pointer into the uiBlock (which I'd rather have avoided), but setting the uiLayoutSetContextPointer(..) was complicated to properly use for submenus and popus.
Diffstat (limited to 'source/blender/editors/screen/screen_context.c')
| -rw-r--r-- | source/blender/editors/screen/screen_context.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index 581c1e3597b..9e2a2f54e0b 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -53,6 +53,7 @@ #include "ED_armature.h" #include "WM_api.h" +#include "UI_interface.h" #include "screen_intern.h" @@ -399,6 +400,9 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult if(sfile) { op= sfile->op; } + else if ((op= uiContextActiveOperator(C))) { + /* do nothign */ + } else { /* note, this checks poll, could be a problem, but this also * happens for the toolbar */ |