[Bf-blender-cvs] [8d3a39ff566] blender2.8: Cleanup: use float name in property range function
Campbell Barton
noreply at git.blender.org
Thu Sep 13 00:08:33 CEST 2018
Commit: 8d3a39ff56631177c22b0e5825ac2c62393b8c16
Author: Campbell Barton
Date: Thu Sep 13 08:17:16 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB8d3a39ff56631177c22b0e5825ac2c62393b8c16
Cleanup: use float name in property range function
===================================================================
M source/blender/editors/gizmo_library/gizmo_library_utils.c
M source/blender/python/intern/bpy_rna_gizmo.c
M source/blender/windowmanager/gizmo/WM_gizmo_api.h
M source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
===================================================================
diff --git a/source/blender/editors/gizmo_library/gizmo_library_utils.c b/source/blender/editors/gizmo_library/gizmo_library_utils.c
index d20aa91d432..e23a1026647 100644
--- a/source/blender/editors/gizmo_library/gizmo_library_utils.c
+++ b/source/blender/editors/gizmo_library/gizmo_library_utils.c
@@ -126,7 +126,7 @@ void gizmo_property_data_update(
if (constrained) {
if ((data->flag & GIZMO_CUSTOM_RANGE_SET) == 0) {
float range[2];
- if (WM_gizmo_target_property_range_get(gz, gz_prop, range)) {
+ if (WM_gizmo_target_property_float_range_get(gz, gz_prop, range)) {
data->range = range[1] - range[0];
data->min = range[0];
}
diff --git a/source/blender/python/intern/bpy_rna_gizmo.c b/source/blender/python/intern/bpy_rna_gizmo.c
index cf0d88a4dc4..8189431dfc9 100644
--- a/source/blender/python/intern/bpy_rna_gizmo.c
+++ b/source/blender/python/intern/bpy_rna_gizmo.c
@@ -518,7 +518,7 @@ static PyObject *bpy_gizmo_target_get_range(PyObject *UNUSED(self), PyObject *ar
case PROP_FLOAT:
{
float range[2];
- WM_gizmo_target_property_range_get(gz, gz_prop, range);
+ WM_gizmo_target_property_float_range_get(gz, gz_prop, range);
return PyC_Tuple_PackArray_F32(range, 2);
}
default:
diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_api.h b/source/blender/windowmanager/gizmo/WM_gizmo_api.h
index b2a8719d5f0..4a01e33cae7 100644
--- a/source/blender/windowmanager/gizmo/WM_gizmo_api.h
+++ b/source/blender/windowmanager/gizmo/WM_gizmo_api.h
@@ -212,7 +212,7 @@ void WM_gizmo_target_property_float_set_array(
struct bContext *C, const struct wmGizmo *gz, struct wmGizmoProperty *gz_prop,
const float *value);
-bool WM_gizmo_target_property_range_get(
+bool WM_gizmo_target_property_float_range_get(
const struct wmGizmo *gz, struct wmGizmoProperty *gz_prop,
float range[2]);
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
index 536dc5329bb..12f9b529c15 100644
--- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
+++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.c
@@ -251,7 +251,7 @@ void WM_gizmo_target_property_float_set_array(
RNA_property_update(C, &gz_prop->ptr, gz_prop->prop);
}
-bool WM_gizmo_target_property_range_get(
+bool WM_gizmo_target_property_float_range_get(
const wmGizmo *gz, wmGizmoProperty *gz_prop,
float range[2])
{
More information about the Bf-blender-cvs
mailing list