Commit: 50d872039c65fa364675e4ffaaddd39e2a2edeb4
Author: makowalski
Date: Fri Jun 18 17:41:28 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB50d872039c65fa364675e4ffaaddd39e2a2edeb4
USD importer naming convention fix.
Removed underscore prefix from static function name, as such
prefixes aren't used anywhere else in the USD I/O code.
===================================================================
M source/blender/io/usd/intern/usd_reader_stage.cc
===================================================================
diff --git a/source/blender/io/usd/intern/usd_reader_stage.cc
b/source/blender/io/usd/intern/usd_reader_stage.cc
index b335f1eacf3..6d98f7d5fdc 100644
--- a/source/blender/io/usd/intern/usd_reader_stage.cc
+++ b/source/blender/io/usd/intern/usd_reader_stage.cc
@@ -173,7 +173,7 @@ bool USDStageReader::prune_by_purpose(const
pxr::UsdGeomImageable &imageable) co
/* Determine if the given reader can use the parent of the encapsulated USD
prim
* to compute the Blender object's transform. If so, the reader is
appropriately
* flagged and the function returns true. Otherwise, the function returns
false. */
-static bool _merge_with_parent(USDPrimReader *reader)
+static bool merge_with_parent(USDPrimReader *reader)
{
USDXformReader *xform_reader = dynamic_cast<USDXformReader *>(reader);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
