From c47be43674f525c568f52afc900963875e742678 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 26 Sep 2018 16:08:45 +1000 Subject: Gizmo: add invoke_prepare callback Allows gizmo groups to set values based on the gizmo about to be invoked. --- source/blender/makesrna/intern/rna_wm_gizmo.c | 28 +++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'source/blender/makesrna/intern/rna_wm_gizmo.c') diff --git a/source/blender/makesrna/intern/rna_wm_gizmo.c b/source/blender/makesrna/intern/rna_wm_gizmo.c index 358549fecd2..ac579851944 100644 --- a/source/blender/makesrna/intern/rna_wm_gizmo.c +++ b/source/blender/makesrna/intern/rna_wm_gizmo.c @@ -719,6 +719,25 @@ static void rna_gizmogroup_draw_prepare_cb(const bContext *C, wmGizmoGroup *gzgr RNA_parameter_list_free(&list); } +static void rna_gizmogroup_invoke_prepare_cb(const bContext *C, wmGizmoGroup *gzgroup, wmGizmo *gz) +{ + extern FunctionRNA rna_GizmoGroup_invoke_prepare_func; + + PointerRNA gzgroup_ptr; + ParameterList list; + FunctionRNA *func; + + RNA_pointer_create(NULL, gzgroup->type->ext.srna, gzgroup, &gzgroup_ptr); + func = &rna_GizmoGroup_invoke_prepare_func; /* RNA_struct_find_function(&wgroupr, "invoke_prepare"); */ + + RNA_parameter_list_create(&list, &gzgroup_ptr, func); + RNA_parameter_set_lookup(&list, "context", &C); + RNA_parameter_set_lookup(&list, "gizmo", &gz); + gzgroup->type->ext.call((bContext *)C, &gzgroup_ptr, func, &list); + + RNA_parameter_list_free(&list); +} + void BPY_RNA_gizmogroup_wrapper(wmGizmoGroupType *gzgt, void *userdata); static void rna_GizmoGroup_unregister(struct Main *bmain, StructRNA *type); @@ -808,6 +827,7 @@ static StructRNA *rna_GizmoGroup_register( dummywgt.setup = (have_function[2]) ? rna_gizmogroup_setup_cb : NULL; dummywgt.refresh = (have_function[3]) ? rna_gizmogroup_refresh_cb : NULL; dummywgt.draw_prepare = (have_function[4]) ? rna_gizmogroup_draw_prepare_cb : NULL; + dummywgt.invoke_prepare = (have_function[5]) ? rna_gizmogroup_invoke_prepare_cb : NULL; wmGizmoGroupType *gzgt = WM_gizmogrouptype_append_ptr( BPY_RNA_gizmogroup_wrapper, (void *)&dummywgt); @@ -1304,6 +1324,14 @@ static void rna_def_gizmogroup(BlenderRNA *brna) parm = RNA_def_pointer(func, "context", "Context", "", ""); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); + func = RNA_def_function(srna, "invoke_prepare", NULL); + RNA_def_function_ui_description(func, "Run before invoke"); + RNA_def_function_flag(func, FUNC_REGISTER_OPTIONAL); + parm = RNA_def_pointer(func, "context", "Context", "", ""); + RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); + parm = RNA_def_pointer(func, "gizmo", "Gizmo", "", ""); + RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED); + /* -------------------------------------------------------------------- */ /* Instance Variables */ -- cgit v1.2.3