diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-03-08 09:42:06 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-08 09:47:02 +0300 |
| commit | 222a941a2bbd71dcaa1012cdea959954ca065c6a (patch) | |
| tree | 798c5a245de42556afabc91d8a7c45eb61337b04 /source/blender/makesrna/intern/rna_object_api.c | |
| parent | 872df463f62d55911a2a732775a8de434c281b2d (diff) | |
| parent | 28f86bf117e9d9d10089ef758a5ec4ade65084c6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_object_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_object_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index 17f19bfc38c..6b631ca0ecf 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -148,7 +148,7 @@ static int rna_Object_visible_get(Object *ob, bContext *C, ReportList *reports) } /* Convert a given matrix from a space to another (using the object and/or a bone as reference). */ -static void rna_Scene_mat_convert_space(Object *ob, ReportList *reports, bPoseChannel *pchan, +static void rna_Object_mat_convert_space(Object *ob, ReportList *reports, bPoseChannel *pchan, float *mat, float *mat_ret, int from, int to) { copy_m4_m4((float (*)[4])mat_ret, (float (*)[4])mat); @@ -585,7 +585,7 @@ void RNA_api_object(StructRNA *srna) RNA_def_function_return(func, parm); /* Matrix space conversion */ - func = RNA_def_function(srna, "convert_space", "rna_Scene_mat_convert_space"); + func = RNA_def_function(srna, "convert_space", "rna_Object_mat_convert_space"); RNA_def_function_ui_description(func, "Convert (transform) the given matrix from one space to another"); RNA_def_function_flag(func, FUNC_USE_REPORTS); parm = RNA_def_pointer(func, "pose_bone", "PoseBone", "", |