diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-10-29 04:49:47 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-10-29 04:49:47 +0300 |
commit | d58cf8292c039a943efbecb5c5ac07ea160f3d0f (patch) | |
tree | 13392812cf5c090b393cb6d86f7dcb16444a678b /source | |
parent | c750ebe113e70c6b7e9efad2219e12546519d44b (diff) |
Cleanup: avoid C++ keyword in DNA
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesdna/DNA_workspace_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_workspace_api.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_workspace_types.h b/source/blender/makesdna/DNA_workspace_types.h index 7f14dc448e2..3ad5071fdf2 100644 --- a/source/blender/makesdna/DNA_workspace_types.h +++ b/source/blender/makesdna/DNA_workspace_types.h @@ -64,7 +64,7 @@ typedef struct bToolRef_Runtime { char data_block[64]; /** Use to infer primary operator to use when setting accelerator keys. */ - char operator[64]; + char op[64]; /** Index when a tool is a member of a group. */ int index; diff --git a/source/blender/makesrna/intern/rna_workspace_api.c b/source/blender/makesrna/intern/rna_workspace_api.c index 3f9c419d7e3..93da4a91738 100644 --- a/source/blender/makesrna/intern/rna_workspace_api.c +++ b/source/blender/makesrna/intern/rna_workspace_api.c @@ -64,7 +64,7 @@ static void rna_WorkspaceTool_setup( STRNCPY(tref_rt.keymap, keymap); STRNCPY(tref_rt.gizmo_group, gizmo_group); STRNCPY(tref_rt.data_block, data_block); - STRNCPY(tref_rt.operator, operator); + STRNCPY(tref_rt.op, operator); tref_rt.index = index; WM_toolsystem_ref_set_from_runtime(C, (WorkSpace *)id, tref, &tref_rt, name); |