archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Manipulator: correct cage-2d scale update

Browse Source
This commit is contained in:
Campbell Barton
2017-08-02 08:34:59 +10:00
parent 4afc94080c
commit 1b51c34e8b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/manipulator_library/manipulator_types/cage2d_manipulator.c
View File

@@ -379,13 +379,13 @@ static bool manipulator_rect_transform_get_prop_value(
PropertyType type = RNA_property_type(mpr_prop->prop); PropertyType type = RNA_property_type(mpr_prop->prop);
if (type != PROP_FLOAT) { if (type != PROP_FLOAT) {
fprintf(stderr, "Rect Transform manipulator can only be bound to float properties"); fprintf(stderr, "Rect Transform manipulator can only be bound to float properties\n");
return false; return false;
} }
else { else {
if (STREQ(mpr_prop->type->idname, "offset")) { if (STREQ(mpr_prop->type->idname, "offset")) {
if (RNA_property_array_length(&mpr_prop->ptr, mpr_prop->prop) != 2) { if (RNA_property_array_length(&mpr_prop->ptr, mpr_prop->prop) != 2) {
fprintf(stderr, "Rect Transform manipulator offset not only be bound to array float property"); fprintf(stderr, "Rect Transform manipulator offset not only be bound to array float property\n");
return false; return false;
} }
RNA_property_float_get_array(&mpr_prop->ptr, mpr_prop->prop, value); RNA_property_float_get_array(&mpr_prop->ptr, mpr_prop->prop, value);
@@ -397,7 +397,7 @@ static bool manipulator_rect_transform_get_prop_value(
} }
else { else {
if (RNA_property_array_length(&mpr_prop->ptr, mpr_prop->prop) != 2) { if (RNA_property_array_length(&mpr_prop->ptr, mpr_prop->prop) != 2) {
fprintf(stderr, "Rect Transform manipulator scale not only be bound to array float property"); fprintf(stderr, "Rect Transform manipulator scale not only be bound to array float property\n");
return false; return false;
} }
RNA_property_float_get_array(&mpr_prop->ptr, mpr_prop->prop, value); RNA_property_float_get_array(&mpr_prop->ptr, mpr_prop->prop, value);
@@ -538,8 +538,8 @@ static void manipulator_rect_transform_property_update(wmManipulator *mpr, wmMan
} }
else if (STREQ(mpr_prop->type->idname, "scale")) { else if (STREQ(mpr_prop->type->idname, "scale")) {
float scale[2]; float scale[2];
RNA_float_get_array(mpr->ptr, "scale", scale);
manipulator_rect_transform_get_prop_value(mpr, mpr_prop, scale); manipulator_rect_transform_get_prop_value(mpr, mpr_prop, scale);
RNA_float_set_array(mpr->ptr, "scale", scale);
} }
else { else {
BLI_assert(0); BLI_assert(0);