Cleanup: clang-format, trailing space

This commit is contained in:
Campbell Barton 2021-01-13 13:15:22 +11:00
parent b9e02eace6
commit bc58425862
5 changed files with 13 additions and 13 deletions

View File

@ -1231,7 +1231,7 @@ function(find_python_package
set(WITH_PYTHON_INSTALL_${_upper_package} OFF PARENT_SCOPE)
else()
message(STATUS "${package} found at '${PYTHON_${_upper_package}_PATH}'")
if(NOT "${relative_include_dir}" STREQUAL "")
set(_relative_include_dir "${package}/${relative_include_dir}")
unset(PYTHON_${_upper_package}_INCLUDE_DIRS CACHE)

View File

@ -63,4 +63,4 @@ void BKE_cryptomatte_store_metadata(struct CryptomatteSession *session,
#ifdef __cplusplus
}
#endif
#endif

View File

@ -728,4 +728,4 @@ void EEVEE_cryptomatte_free(EEVEE_Data *vedata)
BKE_cryptomatte_free(g_data->cryptomatte_session);
g_data->cryptomatte_session = NULL;
}
}
}

View File

@ -132,7 +132,7 @@ typedef struct ParticleData {
*/
/** Index to vert/edge/face. */
int num;
/**
/**
* Index to derived mesh data (face) to avoid slow lookups. It can also have negative
* values DMCACHE_NOTFOUND and DMCACHE_ISCHILD.
*/

View File

@ -412,17 +412,17 @@ static void rna_Particle_uv_on_emitter(ParticleData *particle,
/* get uvco */
if (r_uv && ELEM(from, PART_FROM_FACE, PART_FROM_VOLUME) &&
!ELEM(num, DMCACHE_NOTFOUND, DMCACHE_ISCHILD)) {
MFace *mface;
MTFace *mtface;
MFace *mface;
MTFace *mtface;
mface = modifier->mesh_final->mface;
mtface = modifier->mesh_final->mtface;
mface = modifier->mesh_final->mface;
mtface = modifier->mesh_final->mtface;
if (mface && mtface) {
mtface += num;
psys_interpolate_uvs(mtface, mface->v4, particle->fuv, r_uv);
return;
}
if (mface && mtface) {
mtface += num;
psys_interpolate_uvs(mtface, mface->v4, particle->fuv, r_uv);
return;
}
}
r_uv[0] = 0.0f;