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:
authorCampbell Barton <ideasman42@gmail.com>2016-01-20 07:05:01 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-01-20 09:10:12 +0300
commita1970234390e00bbb8a74534e3783a47ad2d280f (patch)
tree7f80892ef9f2216756313034f639210a8b0fe52d /source/blender/blenkernel/intern/editderivedmesh.c
parent18ffeb689dc6eedef69612471bcf05b6f4925598 (diff)
Cleanup: style, use const
Diffstat (limited to 'source/blender/blenkernel/intern/editderivedmesh.c')
-rw-r--r--source/blender/blenkernel/intern/editderivedmesh.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c
index 642a89df8e0..34da175e64b 100644
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -237,10 +237,13 @@ static void emDM_calcLoopNormalsSpaceArray(
}
+/** \name Tangent Space Calculation
+ * \{ */
+
typedef struct {
const float (*precomputedFaceNormals)[3];
const float (*precomputedLoopNormals)[3];
- BMLoop *(*looptris)[3];
+ const BMLoop *(*looptris)[3];
int cd_loop_uv_offset; /* texture coordinates */
const float (*orco)[3];
float (*tangent)[4]; /* destination */
@@ -270,7 +273,7 @@ static void emdm_ts_GetPosition(
{
//assert(vert_index >= 0 && vert_index < 4);
SGLSLEditMeshToTangent *pMesh = pContext->m_pUserData;
- BMLoop **lt = pMesh->looptris[face_num];
+ const BMLoop **lt = pMesh->looptris[face_num];
const float *co = lt[vert_index]->v->co;
copy_v3_v3(r_co, co);
}
@@ -281,7 +284,7 @@ static void emdm_ts_GetTextureCoordinate(
{
//assert(vert_index >= 0 && vert_index < 4);
SGLSLEditMeshToTangent *pMesh = pContext->m_pUserData;
- BMLoop **lt = pMesh->looptris[face_num];
+ const BMLoop **lt = pMesh->looptris[face_num];
if (pMesh->cd_loop_uv_offset != -1) {
const float *uv = BM_ELEM_CD_GET_VOID_P(lt[vert_index], pMesh->cd_loop_uv_offset);
@@ -299,7 +302,7 @@ static void emdm_ts_GetNormal(
{
//assert(vert_index >= 0 && vert_index < 4);
SGLSLEditMeshToTangent *pMesh = pContext->m_pUserData;
- BMLoop **lt = pMesh->looptris[face_num];
+ const BMLoop **lt = pMesh->looptris[face_num];
const bool smoothnormal = BM_elem_flag_test_bool(lt[0]->f, BM_ELEM_SMOOTH);
if (pMesh->precomputedLoopNormals) {
@@ -324,7 +327,7 @@ static void emdm_ts_SetTSpace(
{
//assert(vert_index >= 0 && vert_index < 4);
SGLSLEditMeshToTangent *pMesh = pContext->m_pUserData;
- BMLoop **lt = pMesh->looptris[face_num];
+ const BMLoop **lt = pMesh->looptris[face_num];
float *pRes = pMesh->tangent[BM_elem_index_get(lt[vert_index])];
copy_v3_v3(pRes, fvTangent);
pRes[3] = fSign;
@@ -394,7 +397,7 @@ static void emDM_calcLoopTangents(DerivedMesh *dm)
mesh2tangent.precomputedFaceNormals = fnors;
mesh2tangent.precomputedLoopNormals = tlnors;
- mesh2tangent.looptris = em->looptris;
+ mesh2tangent.looptris = (const BMLoop *(*)[3])em->looptris;
mesh2tangent.cd_loop_uv_offset = cd_loop_uv_offset;
mesh2tangent.orco = (const float (*)[3])orco;
mesh2tangent.tangent = tangent;
@@ -414,6 +417,9 @@ static void emDM_calcLoopTangents(DerivedMesh *dm)
}
}
+/** \} */
+
+
static void emDM_recalcTessellation(DerivedMesh *UNUSED(dm))
{
/* do nothing */