diff options
Diffstat (limited to 'source/blender/makesrna/intern/rna_wm.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 676fe1e092d..fa6fb73ea8e 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -460,14 +460,14 @@ static PointerRNA rna_OperatorMacro_properties_get(PointerRNA *ptr) static void rna_Event_ascii_get(PointerRNA *ptr, char *value) { - wmEvent *event= (wmEvent*)ptr->id.data; + wmEvent *event= (wmEvent*)ptr->data; value[0]= event->ascii; value[1]= '\0'; } static int rna_Event_ascii_length(PointerRNA *ptr) { - wmEvent *event= (wmEvent*)ptr->id.data; + wmEvent *event= (wmEvent*)ptr->data; return (event->ascii)? 1 : 0; } @@ -762,8 +762,6 @@ static void rna_Operator_unregister(struct Main *bmain, StructRNA *type) static int operator_poll(bContext *C, wmOperatorType *ot) { - extern FunctionRNA rna_Operator_poll_func; - PointerRNA ptr; ParameterList list; FunctionRNA *func; @@ -771,7 +769,7 @@ static int operator_poll(bContext *C, wmOperatorType *ot) int visible; RNA_pointer_create(NULL, ot->ext.srna, NULL, &ptr); /* dummy */ - func= &rna_Operator_poll_func; /* RNA_struct_find_function(&ptr, "poll"); */ + func= RNA_struct_find_function(&ptr, "poll"); RNA_parameter_list_create(&list, &ptr, func); RNA_parameter_set_lookup(&list, "context", &C); @@ -787,8 +785,6 @@ static int operator_poll(bContext *C, wmOperatorType *ot) static int operator_execute(bContext *C, wmOperator *op) { - extern FunctionRNA rna_Operator_execute_func; - PointerRNA opr; ParameterList list; FunctionRNA *func; @@ -796,7 +792,7 @@ static int operator_execute(bContext *C, wmOperator *op) int result; RNA_pointer_create(&CTX_wm_screen(C)->id, op->type->ext.srna, op, &opr); - func= &rna_Operator_execute_func; /* RNA_struct_find_function(&opr, "execute"); */ + func= RNA_struct_find_function(&opr, "execute"); RNA_parameter_list_create(&list, &opr, func); RNA_parameter_set_lookup(&list, "context", &C); @@ -813,8 +809,6 @@ static int operator_execute(bContext *C, wmOperator *op) /* same as execute() but no return value */ static int operator_check(bContext *C, wmOperator *op) { - extern FunctionRNA rna_Operator_check_func; - PointerRNA opr; ParameterList list; FunctionRNA *func; @@ -822,7 +816,7 @@ static int operator_check(bContext *C, wmOperator *op) int result; RNA_pointer_create(&CTX_wm_screen(C)->id, op->type->ext.srna, op, &opr); - func= &rna_Operator_check_func; /* RNA_struct_find_function(&opr, "check"); */ + func= RNA_struct_find_function(&opr, "check"); RNA_parameter_list_create(&list, &opr, func); RNA_parameter_set_lookup(&list, "context", &C); @@ -838,8 +832,6 @@ static int operator_check(bContext *C, wmOperator *op) static int operator_invoke(bContext *C, wmOperator *op, wmEvent *event) { - extern FunctionRNA rna_Operator_invoke_func; - PointerRNA opr; ParameterList list; FunctionRNA *func; @@ -847,7 +839,7 @@ static int operator_invoke(bContext *C, wmOperator *op, wmEvent *event) int result; RNA_pointer_create(&CTX_wm_screen(C)->id, op->type->ext.srna, op, &opr); - func= &rna_Operator_invoke_func; /* RNA_struct_find_function(&opr, "invoke"); */ + func= RNA_struct_find_function(&opr, "invoke"); RNA_parameter_list_create(&list, &opr, func); RNA_parameter_set_lookup(&list, "context", &C); @@ -865,8 +857,6 @@ static int operator_invoke(bContext *C, wmOperator *op, wmEvent *event) /* same as invoke */ static int operator_modal(bContext *C, wmOperator *op, wmEvent *event) { - extern FunctionRNA rna_Operator_modal_func; - PointerRNA opr; ParameterList list; FunctionRNA *func; @@ -874,7 +864,7 @@ static int operator_modal(bContext *C, wmOperator *op, wmEvent *event) int result; RNA_pointer_create(&CTX_wm_screen(C)->id, op->type->ext.srna, op, &opr); - func= &rna_Operator_modal_func; /* RNA_struct_find_function(&opr, "modal"); */ + func= RNA_struct_find_function(&opr, "modal"); RNA_parameter_list_create(&list, &opr, func); RNA_parameter_set_lookup(&list, "context", &C); @@ -891,14 +881,12 @@ static int operator_modal(bContext *C, wmOperator *op, wmEvent *event) static void operator_draw(bContext *C, wmOperator *op) { - extern FunctionRNA rna_Operator_draw_func; - PointerRNA opr; ParameterList list; FunctionRNA *func; RNA_pointer_create(&CTX_wm_screen(C)->id, op->type->ext.srna, op, &opr); - func= &rna_Operator_draw_func; /* RNA_struct_find_function(&opr, "draw"); */ + func= RNA_struct_find_function(&opr, "draw"); RNA_parameter_list_create(&list, &opr, func); RNA_parameter_set_lookup(&list, "context", &C); @@ -910,8 +898,6 @@ static void operator_draw(bContext *C, wmOperator *op) /* same as exec(), but call cancel */ static int operator_cancel(bContext *C, wmOperator *op) { - extern FunctionRNA rna_Operator_cancel_func; - PointerRNA opr; ParameterList list; FunctionRNA *func; @@ -919,7 +905,7 @@ static int operator_cancel(bContext *C, wmOperator *op) int result; RNA_pointer_create(&CTX_wm_screen(C)->id, op->type->ext.srna, op, &opr); - func= &rna_Operator_cancel_func; /* RNA_struct_find_function(&opr, "cancel"); */ + func= RNA_struct_find_function(&opr, "cancel"); RNA_parameter_list_create(&list, &opr, func); RNA_parameter_set_lookup(&list, "context", &C); @@ -1703,7 +1689,7 @@ static void rna_def_keyconfig(BlenderRNA *brna) prop= RNA_def_property(srna, "id", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "id"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, "ID", "ID of the item"); + RNA_def_property_ui_text(prop, "id", "ID of the item"); RNA_def_property_update(prop, 0, "rna_KeyMapItem_update"); prop= RNA_def_property(srna, "any", PROP_BOOLEAN, PROP_NONE); |