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
path: root/intern
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-04-07 07:34:51 +0300
committerCampbell Barton <campbell@blender.org>2022-04-07 07:34:51 +0300
commit792a481bee4352478f624927680e7aa0eaeb2267 (patch)
tree540079205c91056f2dfc4455b17bf1c4ab5a4692 /intern
parent81ec3dce6542f996e5d61017fab83bd721b61822 (diff)
Cleanup: clang-format
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/hydra/camera.cpp11
-rw-r--r--intern/cycles/hydra/node_util.cpp3
-rw-r--r--intern/cycles/scene/geometry.cpp8
3 files changed, 13 insertions, 9 deletions
diff --git a/intern/cycles/hydra/camera.cpp b/intern/cycles/hydra/camera.cpp
index 5d961a6a090..c746a107899 100644
--- a/intern/cycles/hydra/camera.cpp
+++ b/intern/cycles/hydra/camera.cpp
@@ -88,9 +88,9 @@ void HdCyclesCamera::Sync(HdSceneDelegate *sceneDelegate,
if (!value.IsEmpty()) {
_projectionMatrix = value.Get<GfMatrix4d>();
const float focalLength = _data.GetFocalLength(); // Get default focal length
-#if PXR_VERSION >= 2102
+# if PXR_VERSION >= 2102
_data.SetFromViewAndProjectionMatrix(GetViewMatrix(), _projectionMatrix, focalLength);
-#else
+# else
if (_projectionMatrix[2][3] < -0.5) {
_data.SetProjection(GfCamera::Perspective);
@@ -120,7 +120,7 @@ void HdCyclesCamera::Sync(HdSceneDelegate *sceneDelegate,
_data.SetClippingRange(
GfRange1f(nearPlusFarHalf + nearMinusFarHalf, nearPlusFarHalf - nearMinusFarHalf));
}
-#endif
+# endif
}
}
#endif
@@ -150,9 +150,8 @@ void HdCyclesCamera::Sync(HdSceneDelegate *sceneDelegate,
#else
value = sceneDelegate->GetCameraParamValue(id, _tokens->projection);
if (!value.IsEmpty()) {
- _data.SetProjection(value.Get<TfToken>() != _tokens->orthographic ?
- GfCamera::Perspective :
- GfCamera::Orthographic);
+ _data.SetProjection(value.Get<TfToken>() != _tokens->orthographic ? GfCamera::Perspective :
+ GfCamera::Orthographic);
}
#endif
diff --git a/intern/cycles/hydra/node_util.cpp b/intern/cycles/hydra/node_util.cpp
index bdf5786ed75..2fc16bba731 100644
--- a/intern/cycles/hydra/node_util.cpp
+++ b/intern/cycles/hydra/node_util.cpp
@@ -273,7 +273,8 @@ template<typename MatrixArray> array<Transform> convertToCyclesTransformArray(co
array<Transform> cyclesArray;
cyclesArray.reserve(valueData.size());
for (const auto &element : valueData) {
- cyclesArray.push_back_reserved(convertMatrixToCycles<typename MatrixArray::value_type>(element));
+ cyclesArray.push_back_reserved(
+ convertMatrixToCycles<typename MatrixArray::value_type>(element));
}
return cyclesArray;
}
diff --git a/intern/cycles/scene/geometry.cpp b/intern/cycles/scene/geometry.cpp
index 8152a27046f..351ec4f09ae 100644
--- a/intern/cycles/scene/geometry.cpp
+++ b/intern/cycles/scene/geometry.cpp
@@ -179,8 +179,12 @@ bool Geometry::has_true_displacement() const
return false;
}
-void Geometry::compute_bvh(
- Device *device, DeviceScene *dscene, SceneParams *params, Progress *progress, size_t n, size_t total)
+void Geometry::compute_bvh(Device *device,
+ DeviceScene *dscene,
+ SceneParams *params,
+ Progress *progress,
+ size_t n,
+ size_t total)
{
if (progress->get_cancel())
return;