diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-12-16 10:32:12 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-12-16 10:36:49 +0300 |
commit | d855fc4dad10732b479d4f0d7e8fc81b9107108c (patch) | |
tree | cd73d95291610a50ee1a81c65bcdd2df18fe1ced /source | |
parent | 468ac9031765681cde42e9132d16c799158e7aba (diff) |
App Template: use manipulator flag
So templates can enable manipulators.
Also remove invalid enum set.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/blender.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_manipulator_navigate.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 50764e10ceb..60dad141e0b 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -278,6 +278,8 @@ void BKE_blender_userdef_app_template_data_swap(UserDef *userdef_a, UserDef *use DATA_SWAP(font_path_ui); DATA_SWAP(font_path_ui_mono); + DATA_SWAP(manipulator_flag); + #undef SWAP_TYPELESS #undef LIST_SWAP #undef DATA_SWAP diff --git a/source/blender/editors/space_view3d/view3d_manipulator_navigate.c b/source/blender/editors/space_view3d/view3d_manipulator_navigate.c index 553d3b03687..b7a62c3e60f 100644 --- a/source/blender/editors/space_view3d/view3d_manipulator_navigate.c +++ b/source/blender/editors/space_view3d/view3d_manipulator_navigate.c @@ -128,7 +128,6 @@ static void WIDGETGROUP_navigate_setup(const bContext *UNUSED(C), wmManipulatorG navgroup->mpr_array[i] = WM_manipulator_new(info->manipulator, mgroup, NULL); wmManipulator *mpr = navgroup->mpr_array[i]; mpr->flag |= WM_MANIPULATOR_GRAB_CURSOR; - RNA_enum_set(mpr->ptr, "draw_options", ED_MANIPULATOR_GRAB_DRAW_FLAG_FILL); copy_v3_fl(mpr->color, 1.0f); mpr->color[3] = 0.4f; |