diff options
| author | Joshua Leung <aligorith@gmail.com> | 2015-12-12 07:43:00 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2015-12-12 07:43:00 +0300 |
| commit | 50fde02b422a1a1dbc71a7bc95a061e46ce73b33 (patch) | |
| tree | 631d2de1db5a6321241685f8015f740da64c7a85 /source/blender/makesrna/RNA_define.h | |
| parent | 85bbf7e04f2694a160219e07fb44711f157e6237 (diff) | |
| parent | dc98a3b0a74b0e91ad424195ce488a9b14f13e73 (diff) | |
Merge branch 'master' into GPencil_Editing_Stage3
Conflicts:
source/blender/editors/transform/transform_manipulator.c
Diffstat (limited to 'source/blender/makesrna/RNA_define.h')
| -rw-r--r-- | source/blender/makesrna/RNA_define.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesrna/RNA_define.h b/source/blender/makesrna/RNA_define.h index cc876b4375e..bf8ea048fae 100644 --- a/source/blender/makesrna/RNA_define.h +++ b/source/blender/makesrna/RNA_define.h @@ -100,6 +100,8 @@ PropertyRNA *RNA_def_float_color(StructOrFunctionRNA *cont, const char *identifi PropertyRNA *RNA_def_float_matrix(StructOrFunctionRNA *cont, const char *identifier, int rows, int columns, const float *default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax); PropertyRNA *RNA_def_float_rotation(StructOrFunctionRNA *cont, const char *identifier, int len, const float *default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax); +PropertyRNA *RNA_def_float_distance(StructOrFunctionRNA *cont, const char *identifier, float default_value, + float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax); PropertyRNA *RNA_def_float_array(StructOrFunctionRNA *cont, const char *identifier, int len, const float *default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax); |