Cleanup: avoid C++ keyword in DNA
authorCampbell Barton <ideasman42@gmail.com>
Mon, 29 Oct 2018 01:49:47 +0000 (12:49 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 29 Oct 2018 01:49:47 +0000 (12:49 +1100)
source/blender/makesdna/DNA_workspace_types.h
source/blender/makesrna/intern/rna_workspace_api.c

index 7f14dc448e2b1e7ada5f64009baa7480f0d2f955..3ad5071fdf2748d0c8e17ed6652a9cec107da69c 100644 (file)
@@ -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;
index 3f9c419d7e3eb6ffc27bf1d100cc57943f36933f..93da4a91738bad7a418ad8a192ad9c03f722c11c 100644 (file)
@@ -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);