diff options
author | Joseph Eagar <joeedh@gmail.com> | 2022-01-20 14:55:27 +0300 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2022-01-20 14:55:41 +0300 |
commit | 969a571e0fbf9a91be87c671e446f04115a13672 (patch) | |
tree | 9f5055e36bd5e4ad89961002a774e1410bd7a90d /source/blender/blenkernel | |
parent | 4425e0cd64ff23b77c553041858a150665a32ba3 (diff) |
Revert "Sculpt: Multires Heal Brush"
This reverts commit ae349eb2d50524b030f702b8ed3fd75531d4db7e.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_subdiv_ccg.h | 11 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subdiv_ccg.c | 35 |
2 files changed, 0 insertions, 46 deletions
diff --git a/source/blender/blenkernel/BKE_subdiv_ccg.h b/source/blender/blenkernel/BKE_subdiv_ccg.h index 2de16bbddd4..b3aa966e0d0 100644 --- a/source/blender/blenkernel/BKE_subdiv_ccg.h +++ b/source/blender/blenkernel/BKE_subdiv_ccg.h @@ -314,17 +314,6 @@ void BKE_subdiv_ccg_eval_limit_point(const SubdivCCG *subdiv_ccg, const SubdivCCGCoord *coord, float r_point[3]); -void BKE_subdiv_ccg_eval_limit_point_and_derivatives(const SubdivCCG *subdiv_ccg, - const SubdivCCGCoord *coord, - float r_point[3], - float r_dPdu[3], - float r_dPdv[3]); - -void BKE_subdiv_ccg_get_tangent_matrix(const SubdivCCG *subdiv_ccg, - const SubdivCCGCoord *coord, - float mat[3][3], - float r_point[3]); - typedef enum SubdivCCGAdjacencyType { SUBDIV_CCG_ADJACENT_NONE, SUBDIV_CCG_ADJACENT_VERTEX, diff --git a/source/blender/blenkernel/intern/subdiv_ccg.c b/source/blender/blenkernel/intern/subdiv_ccg.c index 2acf94cf7d1..7d876acf776 100644 --- a/source/blender/blenkernel/intern/subdiv_ccg.c +++ b/source/blender/blenkernel/intern/subdiv_ccg.c @@ -37,7 +37,6 @@ #include "BKE_ccg.h" #include "BKE_global.h" #include "BKE_mesh.h" -#include "BKE_multires.h" #include "BKE_subdiv.h" #include "BKE_subdiv_eval.h" @@ -2103,38 +2102,4 @@ void BKE_subdiv_ccg_eval_limit_point(const SubdivCCG *subdiv_ccg, BKE_subdiv_eval_limit_point(subdiv, ptex_face_index, u, v, r_point); } -void BKE_subdiv_ccg_eval_limit_point_and_derivatives(const SubdivCCG *subdiv_ccg, - const SubdivCCGCoord *coord, - float r_point[3], - float r_dPdu[3], - float r_dPdv[3]) -{ - Subdiv *subdiv = subdiv_ccg->subdiv; - int ptex_face_index; - float u, v; - subdiv_ccg_coord_to_ptex_coord(subdiv_ccg, coord, &ptex_face_index, &u, &v); - BKE_subdiv_eval_limit_point_and_derivatives( - subdiv, ptex_face_index, u, v, r_point, r_dPdu, r_dPdv); -} - -void BKE_subdiv_ccg_get_tangent_matrix(const SubdivCCG *subdiv_ccg, - const SubdivCCGCoord *coord, - float mat[3][3], - float r_point[3]) -{ - int ptex_face_index; - float u, v; - float du[3], dv[3]; - - const int face_index = BKE_subdiv_ccg_grid_to_face_index(subdiv_ccg, coord->grid_index); - const SubdivCCGFace *faces = subdiv_ccg->faces; - const SubdivCCGFace *face = &faces[face_index]; - const float corner = coord->grid_index - face->start_grid_index; - - subdiv_ccg_coord_to_ptex_coord(subdiv_ccg, coord, &ptex_face_index, &u, &v); - - BKE_subdiv_ccg_eval_limit_point_and_derivatives(subdiv_ccg, coord, r_point, du, dv); - BKE_multires_construct_tangent_matrix(mat, du, dv, corner); -} - /** \} */ |