diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-06-21 10:25:09 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-06-21 10:25:09 +0300 |
commit | 19df0e3cfd5b9fed891ed81dd1123b2351605a7d (patch) | |
tree | b390440664c2966fdf9adad0148e4869556fc5bb | |
parent | b2510b9e20a4b6ce6bee68e89a801c33b4c2bf9d (diff) |
Cleanup: swap top/bottom args to planes_from_projmat
X & Z were ordered min/max, where as Y was max/min.
-rw-r--r-- | source/blender/blenlib/BLI_math_geom.h | 2 | ||||
-rw-r--r-- | source/blender/blenlib/intern/math_geom.c | 2 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager_data.c | 2 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_knife.c | 3 |
4 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/blenlib/BLI_math_geom.h b/source/blender/blenlib/BLI_math_geom.h index 49188964f3b..43b31d76bb0 100644 --- a/source/blender/blenlib/BLI_math_geom.h +++ b/source/blender/blenlib/BLI_math_geom.h @@ -677,8 +677,8 @@ void window_translate_m4(float winmat[4][4], float perspmat[4][4], const float x void planes_from_projmat(const float mat[4][4], float left[4], float right[4], - float top[4], float bottom[4], + float top[4], float near[4], float far[4]); diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 0a5dc8517d8..7de6e9f843a 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -4911,8 +4911,8 @@ void window_translate_m4(float winmat[4][4], float perspmat[4][4], const float x void planes_from_projmat(const float mat[4][4], float left[4], float right[4], - float top[4], float bottom[4], + float top[4], float near[4], float far[4]) { diff --git a/source/blender/draw/intern/draw_manager_data.c b/source/blender/draw/intern/draw_manager_data.c index 3b852e7f8c8..56909969dd7 100644 --- a/source/blender/draw/intern/draw_manager_data.c +++ b/source/blender/draw/intern/draw_manager_data.c @@ -1572,8 +1572,8 @@ static void draw_frustum_culling_planes_calc(const float (*persmat)[4], float (* planes_from_projmat(persmat, frustum_planes[0], frustum_planes[5], - frustum_planes[3], frustum_planes[1], + frustum_planes[3], frustum_planes[4], frustum_planes[2]); diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index f7cc95af619..2ba1d30900a 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -272,8 +272,7 @@ static void knifetool_draw_angle_snapping(const KnifeTool_OpData *kcd) float v1[3], v2[3]; float planes[4][4]; - planes_from_projmat( - (const float(*)[4])kcd->projmat, planes[2], planes[0], planes[3], planes[1], NULL, NULL); + planes_from_projmat(kcd->projmat, planes[2], planes[0], planes[1], planes[3], NULL, NULL); /* ray-cast all planes */ { |