[Bf-blender-cvs] [b2df29e50d9] master: Cleanup: clang-format
Campbell Barton
noreply at git.blender.org
Sat Feb 15 00:41:17 CET 2020
Commit: b2df29e50d958424e02d6d7fc6a5144b0923b9f0
Author: Campbell Barton
Date: Sat Feb 15 10:37:08 2020 +1100
Branches: master
https://developer.blender.org/rBb2df29e50d958424e02d6d7fc6a5144b0923b9f0
Cleanup: clang-format
===================================================================
M intern/cycles/kernel/svm/svm_math_util.h
M source/blender/blenloader/intern/versioning_280.c
===================================================================
diff --git a/intern/cycles/kernel/svm/svm_math_util.h b/intern/cycles/kernel/svm/svm_math_util.h
index 8b431b54eea..d1e1fa87e53 100644
--- a/intern/cycles/kernel/svm/svm_math_util.h
+++ b/intern/cycles/kernel/svm/svm_math_util.h
@@ -16,8 +16,13 @@
CCL_NAMESPACE_BEGIN
-ccl_device void svm_vector_math(
- float *value, float3 *vector, NodeVectorMathType type, float3 a, float3 b, float3 c, float scale)
+ccl_device void svm_vector_math(float *value,
+ float3 *vector,
+ NodeVectorMathType type,
+ float3 a,
+ float3 b,
+ float3 c,
+ float scale)
{
switch (type) {
case NODE_VECTOR_MATH_ADD:
@@ -69,8 +74,7 @@ ccl_device void svm_vector_math(
*vector = make_float3(safe_modulo(a.x, b.x), safe_modulo(a.y, b.y), safe_modulo(a.z, b.z));
break;
case NODE_VECTOR_MATH_WRAP:
- *vector = make_float3(
- wrapf(a.x, b.x, c.x), wrapf(a.y, b.y, c.y), wrapf(a.z, b.z, c.z));
+ *vector = make_float3(wrapf(a.x, b.x, c.x), wrapf(a.y, b.y, c.y), wrapf(a.z, b.z, c.z));
break;
case NODE_VECTOR_MATH_FRACTION:
*vector = a - floor(a);
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index d306049a7e0..886c7195d9e 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -4473,7 +4473,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
*/
{
/* Keep this block, even when empty. */
-
+
/* Alembic Transform Cache changed from world to local space. */
LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
LISTBASE_FOREACH (bConstraint *, con, &ob->constraints) {
More information about the Bf-blender-cvs
mailing list