From 67e0a44e619685aece11f4ebedb7862ed024760f Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Tue, 17 Oct 2017 00:44:20 +1300 Subject: Replace freeing checks with MEM_SAFE_FREE --- source/blender/blenkernel/intern/fcurve.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index db6c533ab57..aee465ad0a0 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -86,12 +86,11 @@ void free_fcurve(FCurve *fcu) return; /* free curve data */ - if (fcu->bezt) MEM_freeN(fcu->bezt); - if (fcu->fpt) MEM_freeN(fcu->fpt); + MEM_SAFE_FREE(fcu->bezt); + MEM_SAFE_FREE(fcu->fpt); /* free RNA-path, as this were allocated when getting the path string */ - if (fcu->rna_path) - MEM_freeN(fcu->rna_path); + MEM_SAFE_FREE(fcu->rna_path); /* free extra data - i.e. modifiers, and driver */ fcurve_free_driver(fcu); -- cgit v1.2.3 From d0f4d0df2aea12397a504f93b95e00d378da0b16 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 17 Oct 2017 11:50:59 +1100 Subject: Knife Tool: add wait_for_event option --- source/blender/editors/mesh/editmesh_knife.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'source/blender') diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 69e8fa03d72..3ada5b67bab 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -271,6 +271,8 @@ static bool knife_verts_edge_in_face(KnifeVert *v1, KnifeVert *v2, BMFace *f); static void knifetool_free_bmbvh(KnifeTool_OpData *kcd); +static int knifetool_modal(bContext *C, wmOperator *op, const wmEvent *event); + static void knife_update_header(bContext *C, wmOperator *op, KnifeTool_OpData *kcd) { char header[UI_MAX_DRAW_STR]; @@ -2662,6 +2664,7 @@ static int knifetool_invoke(bContext *C, wmOperator *op, const wmEvent *event) { const bool only_select = RNA_boolean_get(op->ptr, "only_selected"); const bool cut_through = !RNA_boolean_get(op->ptr, "use_occlude_geometry"); + const bool wait_for_input = RNA_boolean_get(op->ptr, "wait_for_input"); KnifeTool_OpData *kcd; @@ -2689,6 +2692,18 @@ static int knifetool_invoke(bContext *C, wmOperator *op, const wmEvent *event) knifetool_update_mval_i(kcd, event->mval); + if (wait_for_input == false) { + /* Avoid copy-paste logic. */ + wmEvent event_modal = { + .prevval = KM_NOTHING, + .type = EVT_MODAL_MAP, + .val = KNF_MODAL_ADD_CUT, + }; + int ret = knifetool_modal(C, op, &event_modal); + BLI_assert(ret == OPERATOR_RUNNING_MODAL); + UNUSED_VARS_NDEBUG(ret); + } + knife_update_header(C, op, kcd); return OPERATOR_RUNNING_MODAL; @@ -2955,8 +2970,13 @@ void MESH_OT_knife_tool(wmOperatorType *ot) /* flags */ ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING; + /* properties */ + PropertyRNA *prop; RNA_def_boolean(ot->srna, "use_occlude_geometry", true, "Occlude Geometry", "Only cut the front most geometry"); RNA_def_boolean(ot->srna, "only_selected", false, "Only Selected", "Only cut selected geometry"); + + prop = RNA_def_boolean(ot->srna, "wait_for_input", true, "Wait for Input", ""); + RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE); } -- cgit v1.2.3 From 57ec19e0e5cbb96392eccf12d4ccc17c4cf9b65b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 17 Oct 2017 12:37:26 +1100 Subject: WM: immediate line-gesture activation on tweak Matches border-gesture behavior, needed for binding bisect to tweak event. --- source/blender/windowmanager/intern/wm_operators.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source/blender') diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 9a1c01487b5..d783b5fd925 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -2942,6 +2942,11 @@ int WM_gesture_straightline_invoke(bContext *C, wmOperator *op, const wmEvent *e op->customdata = WM_gesture_new(C, event, WM_GESTURE_STRAIGHTLINE); + if (ISTWEAK(event->type)) { + wmGesture *gesture = op->customdata; + gesture->is_active = true; + } + /* add modal handler */ WM_event_add_modal_handler(C, op); @@ -4416,7 +4421,7 @@ static void gesture_straightline_modal_keymap(wmKeyConfig *keyconf) WM_modalkeymap_add_item(keymap, RIGHTMOUSE, KM_ANY, KM_ANY, 0, GESTURE_MODAL_CANCEL); WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_PRESS, 0, 0, GESTURE_MODAL_BEGIN); - WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_RELEASE, 0, 0, GESTURE_MODAL_SELECT); + WM_modalkeymap_add_item(keymap, LEFTMOUSE, KM_RELEASE, KM_ANY, 0, GESTURE_MODAL_SELECT); /* assign map to operators */ WM_modalkeymap_assign(keymap, "IMAGE_OT_sample_line"); -- cgit v1.2.3