Commit: 32d46f7de6f0cf9c80dde8147ddeecd3ca2e576b
Author: Campbell Barton
Date: Sat Dec 1 19:38:37 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB32d46f7de6f0cf9c80dde8147ddeecd3ca2e576b
Fix camera gizmo sensor check
Also correct wrong but harmless assignment.
===================================================================
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/space_view3d/view3d_gizmo_camera.c
===================================================================
diff --git a/source/blender/editors/interface/interface_handlers.c
b/source/blender/editors/interface/interface_handlers.c
index b8355b31ff0..baf472deb28 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -4381,7 +4381,7 @@ static void ui_numedit_set_active(uiBut *but)
/* we can click on the side arrows to increment/decrement,
* or click inside to edit the value directly */
int mx = data->window->eventstate->x;
- int my = data->window->eventstate->x;
+ int my = data->window->eventstate->y;
ui_window_to_block(data->region, but->block, &mx, &my);
if (mx < (but->rect.xmin + handle_width)) {
diff --git a/source/blender/editors/space_view3d/view3d_gizmo_camera.c
b/source/blender/editors/space_view3d/view3d_gizmo_camera.c
index 0878bef98f2..b96d0874af0 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_camera.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_camera.c
@@ -224,7 +224,7 @@ static void WIDGETGROUP_camera_refresh(const bContext *C,
wmGizmoGroup *gzgroup)
(ca->drawsize * range) :
(scale_matrix * range /
/* Half sensor, intentionally use sensor from camera
and not calculated above. */
- (0.5f * ((ca->sensor_fit == CAMERA_SENSOR_FIT_HOR) ?
ca->sensor_x : ca->sensor_x))));
+ (0.5f * ((ca->sensor_fit == CAMERA_SENSOR_FIT_HOR) ?
ca->sensor_x : ca->sensor_y))));
WM_gizmo_target_property_def_rna_ptr(widget, gz_prop_type,
&camera_ptr, prop, -1);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
