griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename wmManipulatorPropertyType.type -> data_type

Browse Source
This commit is contained in:
Campbell Barton
2017-06-26 14:36:37 +10:00
parent 3edff2e1a4
commit ba6d9fefc2
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/windowmanager/manipulators/WM_manipulator_api.h
View File

@@ -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);
/* -------------------------------------------------------------------- */

2
source/blender/windowmanager/manipulators/WM_manipulator_types.h
View File

@@ -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' */

4
source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c
View File

@@ -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;

2
source/blender/windowmanager/manipulators/wm_manipulator_fn.h
View File

@@ -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 *' */