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

Fix T77735: Numinput of radial control operator behaved incorrectly

Browse Source 
This fixes the behavior of `ctrl+F` and `shift+F` to control the angle
and strength of a brush when the unit scale is not one.

Reviewers: pablodp606

Differential Revision: https://developer.blender.org/D7992
This commit is contained in:
Jacques Lucke
2020-06-15 09:46:27 +02:00
parent bf8b62e874
commit 1d6529873f
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/windowmanager/intern/wm_operators.c
View File

@@ -2730,7 +2730,7 @@ static int radial_control_invoke(bContext *C, wmOperator *op, const wmEvent *eve
rc->num_input.idx_max = 0; rc->num_input.idx_max = 0;
rc->num_input.val_flag[0] |= NUM_NO_NEGATIVE; rc->num_input.val_flag[0] |= NUM_NO_NEGATIVE;
rc->num_input.unit_sys = USER_UNIT_NONE; rc->num_input.unit_sys = USER_UNIT_NONE;
rc->num_input.unit_type[0] = B_UNIT_LENGTH; rc->num_input.unit_type[0] = RNA_SUBTYPE_UNIT_VALUE(RNA_property_unit(rc->prop));
/* get subtype of property */ /* get subtype of property */
rc->subtype = RNA_property_subtype(rc->prop); rc->subtype = RNA_property_subtype(rc->prop);
@@ -2829,7 +2829,6 @@ static int radial_control_modal(bContext *C, wmOperator *op, const wmEvent *even
applyNumInput(&rc->num_input, &numValue); applyNumInput(&rc->num_input, &numValue);
if (rc->subtype == PROP_ANGLE) { if (rc->subtype == PROP_ANGLE) {
numValue = DEG2RADF(numValue);
numValue = fmod(numValue, 2.0f * (float)M_PI); numValue = fmod(numValue, 2.0f * (float)M_PI);
if (numValue < 0.0f) { if (numValue < 0.0f) {
numValue += 2.0f * (float)M_PI; numValue += 2.0f * (float)M_PI;
@@ -2994,7 +2993,6 @@ static int radial_control_modal(bContext *C, wmOperator *op, const wmEvent *even
applyNumInput(&rc->num_input, &numValue); applyNumInput(&rc->num_input, &numValue);
if (rc->subtype == PROP_ANGLE) { if (rc->subtype == PROP_ANGLE) {
numValue = DEG2RADF(numValue);
numValue = fmod(numValue, 2.0f * (float)M_PI); numValue = fmod(numValue, 2.0f * (float)M_PI);
if (numValue < 0.0f) { if (numValue < 0.0f) {
numValue += 2.0f * (float)M_PI; numValue += 2.0f * (float)M_PI;