From 63b01f6beee8eced14ff013ca93732f5c176ad10 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 29 Oct 2013 16:43:58 +0000 Subject: Code cleanup: remove unused block from multire baker Mapping from grid on ll 0 was not used and was incorrect since bmesh merge anyway. --- .../blender/render/intern/source/multires_bake.c | 35 ++++++++++------------ 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/source/blender/render/intern/source/multires_bake.c b/source/blender/render/intern/source/multires_bake.c index 3ae075b4936..a920306732d 100644 --- a/source/blender/render/intern/source/multires_bake.c +++ b/source/blender/render/intern/source/multires_bake.c @@ -611,6 +611,9 @@ static void get_ccgdm_data(DerivedMesh *lodm, DerivedMesh *hidm, float crn_x, crn_y; int grid_size, S, face_side; int *grid_offset, g_index; + int side, grid_index, loc_offs, cell_index, cell_side, row, col; + + BLI_assert(lvl > 0); lodm->getTessFace(lodm, face_index, &mface); @@ -621,25 +624,19 @@ static void get_ccgdm_data(DerivedMesh *lodm, DerivedMesh *hidm, face_side = (grid_size << 1) - 1; - if (lvl == 0) { - g_index = grid_offset[face_index]; - S = mdisp_rot_face_to_crn(mface.v4 ? 4 : 3, face_side, u * (face_side - 1), v * (face_side - 1), &crn_x, &crn_y); - } - else { - int side = (1 << (lvl - 1)) + 1; - int grid_index = DM_origindex_mface_mpoly(index_mf_to_mpoly, index_mp_to_orig, face_index); - int loc_offs = face_index % (1 << (2 * lvl)); - int cell_index = loc_offs % ((side - 1) * (side - 1)); - int cell_side = (grid_size - 1) / (side - 1); - int row = cell_index / (side - 1); - int col = cell_index % (side - 1); - - S = face_index / (1 << (2 * (lvl - 1))) - grid_offset[grid_index]; - g_index = grid_offset[grid_index]; - - crn_y = (row * cell_side) + u * cell_side; - crn_x = (col * cell_side) + v * cell_side; - } + side = (1 << (lvl - 1)) + 1; + grid_index = DM_origindex_mface_mpoly(index_mf_to_mpoly, index_mp_to_orig, face_index); + loc_offs = face_index % (1 << (2 * lvl)); + cell_index = loc_offs % ((side - 1) * (side - 1)); + cell_side = (grid_size - 1) / (side - 1); + row = cell_index / (side - 1); + col = cell_index % (side - 1); + + S = face_index / (1 << (2 * (lvl - 1))) - grid_offset[grid_index]; + g_index = grid_offset[grid_index]; + + crn_y = (row * cell_side) + u * cell_side; + crn_x = (col * cell_side) + v * cell_side; CLAMP(crn_x, 0.0f, grid_size); CLAMP(crn_y, 0.0f, grid_size); -- cgit v1.2.3