Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-01-17 12:47:14 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-01-18 14:29:53 +0300
commit9db73be975ccc3fbbad17361166060cacd84692e (patch)
treeb96066b90b99ade62618fdf40f3ff588fdb54d9e /source/blender/blenkernel/intern/subdiv_ccg.c
parenta676b2b4b4dcd0b6ea1ee352ea8f895809c99153 (diff)
Multires: Cleanup, move utility function to a more public place
Diffstat (limited to 'source/blender/blenkernel/intern/subdiv_ccg.c')
-rw-r--r--source/blender/blenkernel/intern/subdiv_ccg.c27
1 files changed, 2 insertions, 25 deletions
diff --git a/source/blender/blenkernel/intern/subdiv_ccg.c b/source/blender/blenkernel/intern/subdiv_ccg.c
index add8a855228..a94df94a2c6 100644
--- a/source/blender/blenkernel/intern/subdiv_ccg.c
+++ b/source/blender/blenkernel/intern/subdiv_ccg.c
@@ -208,30 +208,6 @@ static void subdiv_ccg_eval_grid_element(
}
}
-BLI_INLINE void rotate_corner_to_quad(
- const int corner,
- const float u, const float v,
- float *r_u, float *r_v)
-{
- if (corner == 0) {
- *r_u = 0.5f - v * 0.5f;
- *r_v = 0.5f - u * 0.5f;
- }
- else if (corner == 1) {
- *r_u = 0.5f + u * 0.5f;
- *r_v = 0.5f - v * 0.5f;
- }
- else if (corner == 2) {
- *r_u = 0.5f + v * 0.5f;
- *r_v = 0.5f + u * 0.5f;
- }
- else {
- BLI_assert(corner == 3);
- *r_u = 0.5f - u * 0.5f;
- *r_v = 0.5f + v * 0.5f;
- }
-}
-
static void subdiv_ccg_eval_regular_grid(CCGEvalGridsData *data,
const int face_index)
{
@@ -251,7 +227,8 @@ static void subdiv_ccg_eval_regular_grid(CCGEvalGridsData *data,
for (int x = 0; x < grid_size; x++) {
const float grid_u = (float)x * grid_size_1_inv;
float u, v;
- rotate_corner_to_quad(corner, grid_u, grid_v, &u, &v);
+ BKE_subdiv_rotate_corner_to_quad(
+ corner, grid_u, grid_v, &u, &v);
const size_t grid_element_index = (size_t)y * grid_size + x;
const size_t grid_element_offset =
grid_element_index * element_size;