[Bf-blender-cvs] [ba6d9fefc27] blender2.8: Rename wmManipulatorPropertyType.type -> data_type
Campbell Barton
noreply at git.blender.org
Mon Jun 26 06:31:35 CEST 2017
Commit: ba6d9fefc2728d36c7a74a399d672ddf250a9528
Author: Campbell Barton
Date: Mon Jun 26 14:36:37 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBba6d9fefc2728d36c7a74a399d672ddf250a9528
Rename wmManipulatorPropertyType.type -> data_type
===================================================================
M source/blender/windowmanager/manipulators/WM_manipulator_api.h
M source/blender/windowmanager/manipulators/WM_manipulator_types.h
M source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
M source/blender/windowmanager/manipulators/wm_manipulator_fn.h
===================================================================
diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_api.h b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
index 50215e38847..d6774333ba4 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_api.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_api.h
@@ -182,7 +182,7 @@ void WM_manipulator_target_property_range_get(
const struct wmManipulatorPropertyType *WM_manipulatortype_target_property_find(
const struct wmManipulatorType *wt, const char *idname);
void WM_manipulatortype_target_property_def(
- struct wmManipulatorType *wt, const char *idname, int type, int array_length);
+ struct wmManipulatorType *wt, const char *idname, int data_type, int array_length);
/* -------------------------------------------------------------------- */
diff --git a/source/blender/windowmanager/manipulators/WM_manipulator_types.h b/source/blender/windowmanager/manipulators/WM_manipulator_types.h
index fd39626f38f..b1b6c5b1c0f 100644
--- a/source/blender/windowmanager/manipulators/WM_manipulator_types.h
+++ b/source/blender/windowmanager/manipulators/WM_manipulator_types.h
@@ -141,7 +141,7 @@ typedef struct wmManipulatorProperty {
typedef struct wmManipulatorPropertyType {
struct wmManipulatorPropertyType *next, *prev;
/* PropertyType, typically 'PROP_FLOAT' */
- int type;
+ int data_type;
int array_length;
/* index within 'wmManipulatorType' */
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;
diff --git a/source/blender/windowmanager/manipulators/wm_manipulator_fn.h b/source/blender/windowmanager/manipulators/wm_manipulator_fn.h
index e61aab20056..ae72e04e1c3 100644
--- a/source/blender/windowmanager/manipulators/wm_manipulator_fn.h
+++ b/source/blender/windowmanager/manipulators/wm_manipulator_fn.h
@@ -58,7 +58,7 @@ typedef void (*wmManipulatorFnExit)(struct bContext *, struct wmManipulator *
typedef int (*wmManipulatorFnCursorGet)(struct wmManipulator *);
typedef void (*wmManipulatorFnSelect)(struct bContext *, struct wmManipulator *, const int);
-/* wmManipulatorProperty */
+/* wmManipulatorProperty ('value' type defined by 'wmManipulatorProperty.data_type') */
typedef void (*wmManipulatorPropertyFnGet)(
const struct wmManipulator *, struct wmManipulatorProperty *,
/* typically 'float *' */
More information about the Bf-blender-cvs
mailing list