[Bf-blender-cvs] [4978ef5ed59] blender2.8: Fix T58573: Camera lens gizmo error on click
Campbell Barton
noreply at git.blender.org
Mon Dec 3 02:57:04 CET 2018
Commit: 4978ef5ed5990df2d8aaf287379c0dec8d9fb251
Author: Campbell Barton
Date: Mon Dec 3 12:55:55 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB4978ef5ed5990df2d8aaf287379c0dec8d9fb251
Fix T58573: Camera lens gizmo error on click
===================================================================
M source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c
===================================================================
diff --git a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c
index 4e41f95a063..1e39e1cca52 100644
--- a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c
+++ b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c
@@ -379,7 +379,11 @@ static void gizmo_arrow_exit(bContext *C, wmGizmo *gz, const bool cancel)
/* Assign incase applying the opetration needs an updated offset
* editmesh bisect needs this. */
if (is_prop_valid) {
- data->offset = WM_gizmo_target_property_float_get(gz, gz_prop);
+ const int transform_flag = RNA_enum_get(arrow->gizmo.ptr, "transform");
+ const bool constrained = (transform_flag & ED_GIZMO_ARROW_XFORM_FLAG_CONSTRAINED) != 0;
+ const bool inverted = (transform_flag & ED_GIZMO_ARROW_XFORM_FLAG_INVERTED) != 0;
+ const float value = WM_gizmo_target_property_float_get(gz, gz_prop);
+ data->offset = gizmo_offset_from_value(data, value, constrained, inverted);
}
return;
}
More information about the Bf-blender-cvs
mailing list