diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-26 17:34:17 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-26 17:34:17 +0400 |
commit | b61abd4fe0da70ce52acf29c065df2af68e2eabe (patch) | |
tree | 67eb2668ca92240580a62f4358f7bc464c938b2e /source/blender/blenkernel/BKE_context.h | |
parent | 43bb431548436b6b1699f795acd107de0f6b86a8 (diff) | |
parent | 25a925ceabb9987c0204df32200b664dcc1aaf44 (diff) |
Merge from trunk r49908-r50219smoke2
Diffstat (limited to 'source/blender/blenkernel/BKE_context.h')
-rw-r--r-- | source/blender/blenkernel/BKE_context.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h index f5e073eb27a..22b8f474cca 100644 --- a/source/blender/blenkernel/BKE_context.h +++ b/source/blender/blenkernel/BKE_context.h @@ -88,7 +88,7 @@ typedef struct bContextStore { int used; } bContextStore; -/* for the conrtext's rna mode enum +/* for the context's rna mode enum * keep aligned with data_mode_strings in context.c */ enum { CTX_MODE_EDIT_MESH = 0, @@ -174,7 +174,7 @@ void CTX_wm_operator_poll_msg_set(struct bContext *C, const char *msg); * * - listbases consist of CollectionPointerLink items and must be * freed with BLI_freelistN! - * - the dir listbase consits of LinkData items */ + * - the dir listbase consists of LinkData items */ /* data type, needed so we can tell between a NULL pointer and an empty list */ enum { |