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-08-03 04:28:26 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-08-03 04:28:26 +0300
commitfc9da7494248faf9ba591d95e470fd5f8efaebc9 (patch)
tree4d9a5e42167a126302cb37245fb9be14f339ffce /source/blender/editors/manipulator_library
parentacde5bb66916c7e48c7cc2e36962f9a5ee81660b (diff)
Manipulator: use default for cage2d dimensions
Also minor cleanuup, assign new vars for manipulator group.
Diffstat (limited to 'source/blender/editors/manipulator_library')
-rw-r--r--source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c b/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
index d0d0756fd8c..bd45232c56f 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
@@ -697,9 +697,9 @@ static void MANIPULATOR_WT_cage_2d(wmManipulatorType *wt)
{ED_MANIPULATOR_RECT_TRANSFORM_FLAG_SCALE_UNIFORM, "SCALE_UNIFORM", 0, "Scale Uniform", ""},
{0, NULL, 0, NULL, NULL}
};
- static float scale_default[2] = {1.0f, 1.0f};
- RNA_def_float_vector(wt->srna, "scale", 2, scale_default, 0, FLT_MAX, "Scale", "", 0.0f, FLT_MAX);
- RNA_def_float_vector(wt->srna, "dimensions", 2, NULL, 0, FLT_MAX, "Dimensions", "", 0.0f, FLT_MAX);
+ static float unit_v2[2] = {1.0f, 1.0f};
+ RNA_def_float_vector(wt->srna, "scale", 2, unit_v2, 0, FLT_MAX, "Scale", "", 0.0f, FLT_MAX);
+ RNA_def_float_vector(wt->srna, "dimensions", 2, unit_v2, 0, FLT_MAX, "Dimensions", "", 0.0f, FLT_MAX);
RNA_def_enum_flag(wt->srna, "transform", rna_enum_transform, 0, "Transform Options", "");
WM_manipulatortype_target_property_def(wt, "offset", PROP_FLOAT, 1);