griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: format

Browse Source
This commit is contained in:
Campbell Barton
2023-08-18 08:38:02 +10:00
parent 28f4bb2007
commit bf35eb9cbc
5 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_outliner/tree/tree_element_grease_pencil_node.cc
View File

@@ -40,4 +40,4 @@ blender::bke::greasepencil::TreeNode &TreeElementGreasePencilNode::node() const
return node_;
}
} // namespace blender::ed::outliner
} // namespace blender::ed::outliner

2
source/blender/editors/space_outliner/tree/tree_element_id_grease_pencil.hh
View File

@@ -26,4 +26,4 @@ class TreeElementIDGreasePencil final : public TreeElementID {
void expand_layer_tree(SpaceOutliner &) const;
};
} // namespace blender::ed::outliner
} // namespace blender::ed::outliner

13
source/blender/io/usd/hydra/image.cc
View File

@@ -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) {

2
source/blender/render/intern/render_types.cc
View File

@@ -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);
}
}

9
tests/python/bl_usd_import_test.py
View File

@@ -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']