Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-06-26 07:36:37 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-06-26 07:36:37 +0300
commitba6d9fefc2728d36c7a74a399d672ddf250a9528 (patch)
treecadf6809111c8e7cc017840f3aff0e796a524d73 /source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
parent3edff2e1a4d1f187c956fba2d5b2954981dc62a2 (diff)
Rename wmManipulatorPropertyType.type -> data_type
Diffstat (limited to 'source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c')
-rw-r--r--source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c b/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
index 9acd1a974cd..4a022c06613 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
@@ -258,7 +258,7 @@ const wmManipulatorPropertyType *WM_manipulatortype_target_property_find(
}
void WM_manipulatortype_target_property_def(
- wmManipulatorType *wt, const char *idname, int type, int array_length)
+ wmManipulatorType *wt, const char *idname, int data_type, int array_length)
{
wmManipulatorPropertyType *mpt;
@@ -267,7 +267,7 @@ void WM_manipulatortype_target_property_def(
const uint idname_size = strlen(idname) + 1;
mpt = MEM_callocN(sizeof(wmManipulatorPropertyType) + idname_size, __func__);
memcpy(mpt->idname, idname, idname_size);
- mpt->type = type;
+ mpt->data_type = data_type;
mpt->array_length = array_length;
mpt->index_in_type = wt->target_property_defs_len;
wt->target_property_defs_len += 1;