diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-21 04:33:36 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-04-21 04:33:36 +0400 |
| commit | cdbfd1db3800cf4f0ea691f09bf05e78a82c80f9 (patch) | |
| tree | b1f22c4ea61ff96ee51c4882047f5a8e3f08c0f1 /source/blender/windowmanager/WM_types.h | |
| parent | 4a19ccfa5fb5cae359269ecaac389f6aace9f959 (diff) | |
| parent | 15eb3452ecd96e4d79d438e8c954918639dc283d (diff) | |
Merged changes in the trunk up to revision 45820.
Conflicts resolved:
source/creator/creator.c
Diffstat (limited to 'source/blender/windowmanager/WM_types.h')
| -rw-r--r-- | source/blender/windowmanager/WM_types.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index d6f0c490289..a3bc4f87b60 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -429,9 +429,6 @@ typedef struct wmTimer { int sleep; /* internal, put timers to sleep when needed */ } wmTimer; -/* Default context for operator names/labels. */ -#define WM_OPERATOR_DEFAULT_I18NCONTEXT "Operator" - typedef struct wmOperatorType { const char *name; /* text for ui, undo */ const char *idname; /* unique identifier */ |