diff options
| author | João Araújo <jaraujo98@gmail.com> | 2017-07-26 13:25:24 +0300 |
|---|---|---|
| committer | João Araújo <jaraujo98@gmail.com> | 2017-07-26 13:25:24 +0300 |
| commit | 59908f5eb73670c97c5bb817290a0dac99089900 (patch) | |
| tree | 709de097c1fac2ff7b172a8b50dc8a91d7b74860 /source/blender/python/intern/bpy_operator_wrap.c | |
| parent | 595f2ca2e06e07acaccc473982bde7a5ed644b50 (diff) | |
| parent | edc6bec9d60204cb81d2e7533402630b076d0d32 (diff) | |
Merge remote-tracking branch 'origin/master' into gsoc2016-improved_extrusiongsoc2016-improved_extrusion
Diffstat (limited to 'source/blender/python/intern/bpy_operator_wrap.c')
| -rw-r--r-- | source/blender/python/intern/bpy_operator_wrap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/python/intern/bpy_operator_wrap.c b/source/blender/python/intern/bpy_operator_wrap.c index 11e27ca3e3c..90719905a79 100644 --- a/source/blender/python/intern/bpy_operator_wrap.c +++ b/source/blender/python/intern/bpy_operator_wrap.c @@ -118,7 +118,7 @@ static void operator_properties_init(wmOperatorType *ot) } -void operator_wrapper(wmOperatorType *ot, void *userdata) +void BPY_RNA_operator_wrapper(wmOperatorType *ot, void *userdata) { /* take care not to overwrite anything set in * WM_operatortype_append_ptr before opfunc() is called */ @@ -134,7 +134,7 @@ void operator_wrapper(wmOperatorType *ot, void *userdata) operator_properties_init(ot); } -void macro_wrapper(wmOperatorType *ot, void *userdata) +void BPY_RNA_operator_macro_wrapper(wmOperatorType *ot, void *userdata) { wmOperatorType *data = (wmOperatorType *)userdata; |