diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-05-14 10:35:08 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-05-14 10:35:08 +0300 |
commit | c1c0b661c0147faf565f6fde080c356504710a70 (patch) | |
tree | 48bb8edd856b07cf3604a7a905644b944dc28cf3 | |
parent | 20c3db6604e8de49dc780201ce583041d017064d (diff) |
Cleanup: clang-format
-rw-r--r-- | intern/cycles/render/geometry.cpp | 8 | ||||
-rw-r--r-- | intern/cycles/render/geometry.h | 7 | ||||
-rw-r--r-- | intern/cycles/render/hair.cpp | 3 | ||||
-rw-r--r-- | intern/cycles/render/hair.h | 5 | ||||
-rw-r--r-- | intern/cycles/render/mesh.h | 5 | ||||
-rw-r--r-- | source/blender/compositor/intern/COM_ChunkOrderHotspot.cc | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_cursor.c | 3 | ||||
-rw-r--r-- | source/blender/functions/FN_generic_virtual_array.hh | 4 | ||||
-rw-r--r-- | tests/python/bl_blendfile_library_overrides.py | 2 | ||||
-rw-r--r-- | tests/python/compositor_render_tests.py | 1 | ||||
-rw-r--r-- | tests/python/operators.py | 4 |
11 files changed, 28 insertions, 16 deletions
diff --git a/intern/cycles/render/geometry.cpp b/intern/cycles/render/geometry.cpp index 5d8fc236e99..16fc36231b4 100644 --- a/intern/cycles/render/geometry.cpp +++ b/intern/cycles/render/geometry.cpp @@ -46,7 +46,7 @@ CCL_NAMESPACE_BEGIN /* Geometry */ -PackFlags operator |=(PackFlags &pack_flags, uint32_t value) +PackFlags operator|=(PackFlags &pack_flags, uint32_t value) { pack_flags = (PackFlags)((uint32_t)pack_flags | value); return pack_flags; @@ -1325,7 +1325,8 @@ void GeometryManager::device_update_bvh(Device *device, // Iterate over scene mesh list instead of objects, since 'optix_prim_offset' was calculated // based on that list, which may be ordered differently from the object list. foreach (Geometry *geom, scene->geometry) { - /* Make a copy of the pack_flags so the current geometry's flags do not pollute the others'. */ + /* Make a copy of the pack_flags so the current geometry's flags do not pollute the others'. + */ PackFlags geom_pack_flags = pack_flags; if (geom->is_modified()) { @@ -1951,7 +1952,8 @@ void GeometryManager::device_update(Device *device, * Also update the BVH if the transformations change, we cannot rely on tagging the Geometry * as modified in this case, as we may accumulate displacement if the vertices do not also * change. */ - bool need_update_scene_bvh = (scene->bvh == nullptr || (update_flags & (TRANSFORM_MODIFIED | VISIBILITY_MODIFIED)) != 0); + bool need_update_scene_bvh = (scene->bvh == nullptr || + (update_flags & (TRANSFORM_MODIFIED | VISIBILITY_MODIFIED)) != 0); { scoped_callback_timer timer([scene](double time) { if (scene->update_stats) { diff --git a/intern/cycles/render/geometry.h b/intern/cycles/render/geometry.h index 4fd867d9894..4d11d04e4c8 100644 --- a/intern/cycles/render/geometry.h +++ b/intern/cycles/render/geometry.h @@ -59,7 +59,7 @@ enum PackFlags : uint32_t { PACK_ALL = (PACK_GEOMETRY | PACK_VERTICES | PACK_VISIBILITY), }; -PackFlags operator |= (PackFlags &pack_flags, uint32_t value); +PackFlags operator|=(PackFlags &pack_flags, uint32_t value); /* Geometry * @@ -144,7 +144,10 @@ class Geometry : public Node { int n, int total); - virtual void pack_primitives(PackedBVH *pack, int object, uint visibility, PackFlags pack_flags) = 0; + virtual void pack_primitives(PackedBVH *pack, + int object, + uint visibility, + PackFlags pack_flags) = 0; /* Check whether the geometry should have own BVH built separately. Briefly, * own BVH is needed for geometry, if: diff --git a/intern/cycles/render/hair.cpp b/intern/cycles/render/hair.cpp index 1cae16d7f32..72fc612c0c0 100644 --- a/intern/cycles/render/hair.cpp +++ b/intern/cycles/render/hair.cpp @@ -522,7 +522,8 @@ void Hair::pack_primitives(PackedBVH *pack, int object, uint visibility, PackFla uint type = has_motion_blur() ? ((curve_shape == CURVE_RIBBON) ? PRIMITIVE_MOTION_CURVE_RIBBON : PRIMITIVE_MOTION_CURVE_THICK) : - ((curve_shape == CURVE_RIBBON) ? PRIMITIVE_CURVE_RIBBON : PRIMITIVE_CURVE_THICK); + ((curve_shape == CURVE_RIBBON) ? PRIMITIVE_CURVE_RIBBON : + PRIMITIVE_CURVE_THICK); size_t index = 0; for (size_t j = 0; j < num_curves(); ++j) { diff --git a/intern/cycles/render/hair.h b/intern/cycles/render/hair.h index 9c553624077..1a8f422e8c4 100644 --- a/intern/cycles/render/hair.h +++ b/intern/cycles/render/hair.h @@ -146,7 +146,10 @@ class Hair : public Geometry { /* BVH */ void pack_curves(Scene *scene, float4 *curve_key_co, float4 *curve_data, size_t curvekey_offset); - void pack_primitives(PackedBVH *pack, int object, uint visibility, PackFlags pack_flags) override; + void pack_primitives(PackedBVH *pack, + int object, + uint visibility, + PackFlags pack_flags) override; }; CCL_NAMESPACE_END diff --git a/intern/cycles/render/mesh.h b/intern/cycles/render/mesh.h index 23a4b91d626..e9e79f7f20d 100644 --- a/intern/cycles/render/mesh.h +++ b/intern/cycles/render/mesh.h @@ -232,7 +232,10 @@ class Mesh : public Geometry { size_t tri_offset); void pack_patches(uint *patch_data, uint vert_offset, uint face_offset, uint corner_offset); - void pack_primitives(PackedBVH *pack, int object, uint visibility, PackFlags pack_flags) override; + void pack_primitives(PackedBVH *pack, + int object, + uint visibility, + PackFlags pack_flags) override; void tessellate(DiagSplit *split); diff --git a/source/blender/compositor/intern/COM_ChunkOrderHotspot.cc b/source/blender/compositor/intern/COM_ChunkOrderHotspot.cc index 79afcc9deea..b8e19fc2c34 100644 --- a/source/blender/compositor/intern/COM_ChunkOrderHotspot.cc +++ b/source/blender/compositor/intern/COM_ChunkOrderHotspot.cc @@ -30,4 +30,4 @@ double ChunkOrderHotspot::calc_distance(int x, int y) return result; } -} // namespace blender::compositor
\ No newline at end of file +} // namespace blender::compositor diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index 12e4dee6f99..3829aeebbeb 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -1675,7 +1675,8 @@ static void paint_cursor_draw_3d_view_brush_cursor_inactive(PaintCursorContext * GPU_matrix_mul(pcontext->vc.obact->obmat); /* Drawing Cursor overlays in 3D object space. */ - if (is_brush_tool && brush->sculpt_tool == SCULPT_TOOL_GRAB && (brush->flag & BRUSH_GRAB_ACTIVE_VERTEX)) { + if (is_brush_tool && brush->sculpt_tool == SCULPT_TOOL_GRAB && + (brush->flag & BRUSH_GRAB_ACTIVE_VERTEX)) { SCULPT_geometry_preview_lines_update(pcontext->C, pcontext->ss, pcontext->radius); sculpt_geometry_preview_lines_draw( pcontext->pos, pcontext->brush, pcontext->is_multires, pcontext->ss); diff --git a/source/blender/functions/FN_generic_virtual_array.hh b/source/blender/functions/FN_generic_virtual_array.hh index d8641f7ae80..c89423375c9 100644 --- a/source/blender/functions/FN_generic_virtual_array.hh +++ b/source/blender/functions/FN_generic_virtual_array.hh @@ -688,7 +688,7 @@ class GVArray_For_EmbeddedVArray : public GVArray_For_VArray<T> { public: template<typename... Args> - GVArray_For_EmbeddedVArray(const int64_t size, Args &&...args) + GVArray_For_EmbeddedVArray(const int64_t size, Args &&... args) : GVArray_For_VArray<T>(size), embedded_varray_(std::forward<Args>(args)...) { this->varray_ = &embedded_varray_; @@ -703,7 +703,7 @@ class GVMutableArray_For_EmbeddedVMutableArray : public GVMutableArray_For_VMuta public: template<typename... Args> - GVMutableArray_For_EmbeddedVMutableArray(const int64_t size, Args &&...args) + GVMutableArray_For_EmbeddedVMutableArray(const int64_t size, Args &&... args) : GVMutableArray_For_VMutableArray<T>(size), embedded_varray_(std::forward<Args>(args)...) { this->varray_ = &embedded_varray_; diff --git a/tests/python/bl_blendfile_library_overrides.py b/tests/python/bl_blendfile_library_overrides.py index e2c6432b380..48625a1ecdb 100644 --- a/tests/python/bl_blendfile_library_overrides.py +++ b/tests/python/bl_blendfile_library_overrides.py @@ -75,7 +75,7 @@ class TestLibraryOverrides(TestHelper, unittest.TestCase): assert(override_operation.operation == 'REPLACE') # Setting location.y overridded all elements in the location array. -1 is a wildcard. assert(override_operation.subitem_local_index == -1) - + def test_link_permissive(self): """ Linked assets with a permissive template. diff --git a/tests/python/compositor_render_tests.py b/tests/python/compositor_render_tests.py index 6a026ae88d2..fbdae595c51 100644 --- a/tests/python/compositor_render_tests.py +++ b/tests/python/compositor_render_tests.py @@ -61,4 +61,3 @@ def main(): if not inside_blender and __name__ == "__main__": main() - diff --git a/tests/python/operators.py b/tests/python/operators.py index 4c863edfbdb..c209b01c20c 100644 --- a/tests/python/operators.py +++ b/tests/python/operators.py @@ -316,13 +316,13 @@ def main(): # normal case MeshTest("CubeFaceUnsubdivide", "testCubeUnsubdivide", "expectedCubeUnsubdivide", [OperatorSpecEditMode("unsubdivide", {}, "FACE", {i for i in range(6)})]), - + # T87259 - test cases MeshTest("CubeEdgeUnsubdivide", "testCubeEdgeUnsubdivide", "expectedCubeEdgeUnsubdivide", [OperatorSpecEditMode("unsubdivide", {}, "EDGE", {i for i in range(6)})]), MeshTest("UVSphereUnsubdivide", "testUVSphereUnsubdivide", "expectedUVSphereUnsubdivide", [OperatorSpecEditMode("unsubdivide", {'iterations': 9}, "FACE", {i for i in range(512)})]), - + # vert connect path # Tip: It works only if there is an already existing face or more than 2 vertices. MeshTest("CubeVertConnectPath", "testCubeVertConnectPath", "expectedCubeVertConnectPath", |