Commit: b4e06bd7d4389a9f69b1754d7de7cc88d00ba801
Author: Germano Cavalcante
Date: Thu Feb 3 09:52:41 2022 -0300
Branches: master
https://developer.blender.org/rBb4e06bd7d4389a9f69b1754d7de7cc88d00ba801
Cleanup: Rename 'TRACKBALLSIZE' to 'V3D_OP_TRACKBALLSIZE'
===================================================================
M source/blender/editors/space_view3d/view3d_navigate.c
M source/blender/editors/space_view3d/view3d_navigate.h
M source/blender/editors/space_view3d/view3d_navigate_rotate.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_navigate.c
b/source/blender/editors/space_view3d/view3d_navigate.c
index d57a803b73f..7818a062eb5 100644
--- a/source/blender/editors/space_view3d/view3d_navigate.c
+++ b/source/blender/editors/space_view3d/view3d_navigate.c
@@ -114,7 +114,7 @@ void view3d_operator_properties_common(wmOperatorType *ot,
const enum eV3D_OpPro
void calctrackballvec(const rcti *rect, const int event_xy[2], float r_dir[3])
{
- const float radius = TRACKBALLSIZE;
+ const float radius = V3D_OP_TRACKBALLSIZE;
const float t = radius / (float)M_SQRT2;
const float size[2] = {BLI_rcti_size_x(rect), BLI_rcti_size_y(rect)};
/* Aspect correct so dragging in a non-square view doesn't squash the
direction.
diff --git a/source/blender/editors/space_view3d/view3d_navigate.h
b/source/blender/editors/space_view3d/view3d_navigate.h
index 5e080664ae9..9afae4db3bf 100644
--- a/source/blender/editors/space_view3d/view3d_navigate.h
+++ b/source/blender/editors/space_view3d/view3d_navigate.h
@@ -27,7 +27,7 @@
* Size of the sphere being dragged for trackball rotation within the view
bounds.
* also affects speed (smaller is faster).
*/
-#define TRACKBALLSIZE (1.1f)
+#define V3D_OP_TRACKBALLSIZE (1.1f)
struct ARegion;
struct bContext;
diff --git a/source/blender/editors/space_view3d/view3d_navigate_rotate.c
b/source/blender/editors/space_view3d/view3d_navigate_rotate.c
index 081fdb258d9..e846a3ba1db 100644
--- a/source/blender/editors/space_view3d/view3d_navigate_rotate.c
+++ b/source/blender/editors/space_view3d/view3d_navigate_rotate.c
@@ -201,7 +201,7 @@ static void viewrotate_apply(ViewOpsData *vod, const int
event_xy[2])
sub_v3_v3v3(dvec, newvec, vod->init.trackvec);
- angle = (len_v3(dvec) / (2.0f * TRACKBALLSIZE)) * (float)M_PI;
+ angle = (len_v3(dvec) / (2.0f * V3D_OP_TRACKBALLSIZE)) * (float)M_PI;
/* Before applying the sensitivity this is rotating 1:1,
* where the cursor would match the surface of a sphere in the view. */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
