diff --git a/source/blender/editors/space_outliner/tree/tree_element_grease_pencil_node.cc b/source/blender/editors/space_outliner/tree/tree_element_grease_pencil_node.cc index 33d52dfd362..a524c7a7421 100644 --- a/source/blender/editors/space_outliner/tree/tree_element_grease_pencil_node.cc +++ b/source/blender/editors/space_outliner/tree/tree_element_grease_pencil_node.cc @@ -40,4 +40,4 @@ blender::bke::greasepencil::TreeNode &TreeElementGreasePencilNode::node() const return node_; } -} // namespace blender::ed::outliner \ No newline at end of file +} // namespace blender::ed::outliner diff --git a/source/blender/editors/space_outliner/tree/tree_element_id_grease_pencil.hh b/source/blender/editors/space_outliner/tree/tree_element_id_grease_pencil.hh index 819e9a3fcd6..f1cb829c10b 100644 --- a/source/blender/editors/space_outliner/tree/tree_element_id_grease_pencil.hh +++ b/source/blender/editors/space_outliner/tree/tree_element_id_grease_pencil.hh @@ -26,4 +26,4 @@ class TreeElementIDGreasePencil final : public TreeElementID { void expand_layer_tree(SpaceOutliner &) const; }; -} // namespace blender::ed::outliner \ No newline at end of file +} // namespace blender::ed::outliner diff --git a/source/blender/io/usd/hydra/image.cc b/source/blender/io/usd/hydra/image.cc index 6f7f73c6d2b..1812c6f3388 100644 --- a/source/blender/io/usd/hydra/image.cc +++ b/source/blender/io/usd/hydra/image.cc @@ -92,13 +92,14 @@ std::string cache_or_get_image_file(Main *bmain, Scene *scene, Image *image, Ima snprintf(subfolder, sizeof(subfolder), "unpack_%p", image); LISTBASE_FOREACH (ImagePackedFile *, ipf, &image->packedfiles) { char path[FILE_MAX]; - BLI_path_join(path, sizeof(path), dir_path.c_str(), subfolder, BLI_path_basename(ipf->filepath)); + BLI_path_join( + path, sizeof(path), dir_path.c_str(), subfolder, BLI_path_basename(ipf->filepath)); cached_path = BKE_packedfile_unpack_to_file(nullptr, - BKE_main_blendfile_path(bmain), - dir_path.c_str(), - path, - ipf->packedfile, - PF_WRITE_LOCAL); + BKE_main_blendfile_path(bmain), + dir_path.c_str(), + path, + ipf->packedfile, + PF_WRITE_LOCAL); /* Take first succesfully unpacked image. */ if (cached_path != nullptr) { diff --git a/source/blender/render/intern/render_types.cc b/source/blender/render/intern/render_types.cc index 95dabfafdf4..1c15b699fe6 100644 --- a/source/blender/render/intern/render_types.cc +++ b/source/blender/render/intern/render_types.cc @@ -112,4 +112,4 @@ bool Render::prepare_viewlayer(struct ViewLayer *view_layer, struct Depsgraph *d } return prepare_viewlayer_cb(prepare_vl_handle, view_layer, depsgraph); -} \ No newline at end of file +} diff --git a/tests/python/bl_usd_import_test.py b/tests/python/bl_usd_import_test.py index a368fad56fc..8aee8e6073b 100644 --- a/tests/python/bl_usd_import_test.py +++ b/tests/python/bl_usd_import_test.py @@ -371,9 +371,12 @@ class USDImportTest(AbstractUSDTest): # Verify expected deform groups. # There are 4 points in each group. for i in range(4): - self.assertAlmostEqual(mesh_obj.vertex_groups['Hand'].weight(i), 1.0, 2, "Unexpected weight for Hand deform vert") - self.assertAlmostEqual(mesh_obj.vertex_groups['Shoulder'].weight(4 + i), 1.0, 2, "Unexpected weight for Shoulder deform vert") - self.assertAlmostEqual(mesh_obj.vertex_groups['Elbow'].weight(8 + i), 1.0, 2, "Unexpected weight for Elbow deform vert") + self.assertAlmostEqual(mesh_obj.vertex_groups['Hand'].weight( + i), 1.0, 2, "Unexpected weight for Hand deform vert") + self.assertAlmostEqual(mesh_obj.vertex_groups['Shoulder'].weight( + 4 + i), 1.0, 2, "Unexpected weight for Shoulder deform vert") + self.assertAlmostEqual(mesh_obj.vertex_groups['Elbow'].weight( + 8 + i), 1.0, 2, "Unexpected weight for Elbow deform vert") action = bpy.data.actions['SkelAction']