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>2021-01-13 05:15:22 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-01-13 05:15:22 +0300
commitbc584258626249a005a518661aabe080ec25f276 (patch)
treeb0a967d8abec8fadd9bfe51176e60f23162b2fc9
parentb9e02eace69ebc003f3598b0ba1bf0682f21c411 (diff)
Cleanup: clang-format, trailing space
-rw-r--r--build_files/cmake/macros.cmake2
-rw-r--r--source/blender/blenkernel/BKE_cryptomatte.h2
-rw-r--r--source/blender/draw/engines/eevee/eevee_cryptomatte.c2
-rw-r--r--source/blender/makesdna/DNA_particle_types.h2
-rw-r--r--source/blender/makesrna/intern/rna_particle.c18
5 files changed, 13 insertions, 13 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index f4b36597611..d1f51b99c67 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -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)
diff --git a/source/blender/blenkernel/BKE_cryptomatte.h b/source/blender/blenkernel/BKE_cryptomatte.h
index 3abaf5256df..eb2de96a745 100644
--- a/source/blender/blenkernel/BKE_cryptomatte.h
+++ b/source/blender/blenkernel/BKE_cryptomatte.h
@@ -63,4 +63,4 @@ void BKE_cryptomatte_store_metadata(struct CryptomatteSession *session,
#ifdef __cplusplus
}
-#endif \ No newline at end of file
+#endif
diff --git a/source/blender/draw/engines/eevee/eevee_cryptomatte.c b/source/blender/draw/engines/eevee/eevee_cryptomatte.c
index ce714715c6c..91a230e987c 100644
--- a/source/blender/draw/engines/eevee/eevee_cryptomatte.c
+++ b/source/blender/draw/engines/eevee/eevee_cryptomatte.c
@@ -728,4 +728,4 @@ void EEVEE_cryptomatte_free(EEVEE_Data *vedata)
BKE_cryptomatte_free(g_data->cryptomatte_session);
g_data->cryptomatte_session = NULL;
}
-} \ No newline at end of file
+}
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 5310ec56b26..10fcca734b2 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -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.
*/
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index bc9eda3cb5f..05d7af6d436 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -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;