[Bf-blender-cvs] [97adb3e4932] usd-importer-T81257-merge: USD Import: removed WM_reportf() trace calls.
makowalski
noreply at git.blender.org
Thu Mar 11 01:16:39 CET 2021
Commit: 97adb3e4932ee25c3281407fbfdda7e63c6564e7
Author: makowalski
Date: Wed Mar 10 18:41:44 2021 -0500
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB97adb3e4932ee25c3281407fbfdda7e63c6564e7
USD Import: removed WM_reportf() trace calls.
===================================================================
M source/blender/io/usd/intern/usd_capi.cc
M source/blender/io/usd/intern/usd_reader_camera.cc
M source/blender/io/usd/intern/usd_reader_curve.cc
M source/blender/io/usd/intern/usd_reader_light.cc
M source/blender/io/usd/intern/usd_reader_mesh.cc
M source/blender/io/usd/intern/usd_reader_nurbs.cc
M source/blender/io/usd/intern/usd_reader_prim.cc
M source/blender/io/usd/intern/usd_reader_volume.cc
M source/blender/io/usd/intern/usd_reader_xform.cc
===================================================================
diff --git a/source/blender/io/usd/intern/usd_capi.cc b/source/blender/io/usd/intern/usd_capi.cc
index 06c25a297fc..f456242cdb0 100644
--- a/source/blender/io/usd/intern/usd_capi.cc
+++ b/source/blender/io/usd/intern/usd_capi.cc
@@ -497,7 +497,6 @@ struct ImportJobData {
static void import_startjob(void *customdata, short *stop, short *do_update, float *progress)
{
- WM_reportf(RPT_WARNING, "Import start job: %s", 0);
ImportJobData *data = static_cast<ImportJobData *>(customdata);
data->stop = stop;
@@ -657,8 +656,6 @@ static void import_startjob(void *customdata, short *stop, short *do_update, flo
static void import_endjob(void *customdata)
{
- WM_reportf(RPT_WARNING, "Import end job: %s", 0);
-
ImportJobData *data = static_cast<ImportJobData *>(customdata);
std::vector<USDPrimReader *>::iterator iter;
diff --git a/source/blender/io/usd/intern/usd_reader_camera.cc b/source/blender/io/usd/intern/usd_reader_camera.cc
index e1af9df2b54..23b196ff6cf 100644
--- a/source/blender/io/usd/intern/usd_reader_camera.cc
+++ b/source/blender/io/usd/intern/usd_reader_camera.cc
@@ -48,7 +48,6 @@ extern "C" {
void USDCameraReader::createObject(Main *bmain, double motionSampleTime)
{
- WM_reportf(RPT_WARNING, "Creating blender camera for prim: %s", m_prim.GetPath().GetText());
Camera *bcam = static_cast<Camera *>(BKE_camera_add(bmain, m_name.c_str()));
m_object = BKE_object_add_only_object(bmain, OB_CAMERA, m_name.c_str());
diff --git a/source/blender/io/usd/intern/usd_reader_curve.cc b/source/blender/io/usd/intern/usd_reader_curve.cc
index 97acf29181d..084e7fa2eba 100644
--- a/source/blender/io/usd/intern/usd_reader_curve.cc
+++ b/source/blender/io/usd/intern/usd_reader_curve.cc
@@ -59,7 +59,6 @@ extern "C" {
void USDCurvesReader::createObject(Main *bmain, double motionSampleTime)
{
- WM_reportf(RPT_WARNING, "Creating blender curve for prim: %s", m_prim.GetPath().GetText());
m_curve = BKE_curve_add(bmain, m_name.c_str(), OB_CURVE);
m_curve->flag |= CU_DEFORM_FILL | CU_3D;
@@ -72,8 +71,6 @@ void USDCurvesReader::createObject(Main *bmain, double motionSampleTime)
void USDCurvesReader::readObjectData(Main *bmain, double motionSampleTime)
{
- WM_reportf(RPT_WARNING, "Reading specific camera data: %s", m_prim.GetPath().GetText());
-
Curve *cu = (Curve *)m_object->data;
read_curve_sample(cu, motionSampleTime);
@@ -265,4 +262,4 @@ Mesh *USDCurvesReader::read_mesh(struct Mesh *existing_mesh,
}
return BKE_mesh_new_nomain_from_curve(m_object);
-}
\ No newline at end of file
+}
diff --git a/source/blender/io/usd/intern/usd_reader_light.cc b/source/blender/io/usd/intern/usd_reader_light.cc
index d15b2086fb8..3817c91684c 100644
--- a/source/blender/io/usd/intern/usd_reader_light.cc
+++ b/source/blender/io/usd/intern/usd_reader_light.cc
@@ -58,7 +58,6 @@ extern "C" {
void USDLightReader::createObject(Main *bmain, double motionSampleTime)
{
- WM_reportf(RPT_WARNING, "Creating blender light for prim: %s", m_prim.GetPath().GetText());
Light *blight = static_cast<Light *>(BKE_light_add(bmain, m_name.c_str()));
m_object = BKE_object_add_only_object(bmain, OB_LAMP, m_name.c_str());
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc
index e591ed859e5..45b3796dc29 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.cc
+++ b/source/blender/io/usd/intern/usd_reader_mesh.cc
@@ -214,8 +214,6 @@ void USDMeshReader::createObject(Main *bmain, double motionSampleTime)
void USDMeshReader::readObjectData(Main *bmain, double motionSampleTime)
{
- WM_reportf(RPT_WARNING, "Reading specific mesh data: %s", m_prim.GetPath().GetText());
-
Mesh *mesh = (Mesh *)m_object->data;
m_isInitialLoad = true;
diff --git a/source/blender/io/usd/intern/usd_reader_nurbs.cc b/source/blender/io/usd/intern/usd_reader_nurbs.cc
index 7d6693b78a4..d03227ebf8c 100644
--- a/source/blender/io/usd/intern/usd_reader_nurbs.cc
+++ b/source/blender/io/usd/intern/usd_reader_nurbs.cc
@@ -76,7 +76,6 @@ static bool set_knots(const pxr::VtDoubleArray &knots, float *&nu_knots)
void USDNurbsReader::createObject(Main *bmain, double motionSampleTime)
{
- WM_reportf(RPT_WARNING, "Creating blender curve for prim: %s", m_prim.GetPath().GetText());
m_curve = BKE_curve_add(bmain, m_name.c_str(), OB_CURVE);
m_curve->flag |= CU_DEFORM_FILL | CU_3D;
@@ -89,8 +88,6 @@ void USDNurbsReader::createObject(Main *bmain, double motionSampleTime)
void USDNurbsReader::readObjectData(Main *bmain, double motionSampleTime)
{
- WM_reportf(RPT_WARNING, "Reading specific camera data: %s", m_prim.GetPath().GetText());
-
Curve *cu = (Curve *)m_object->data;
read_curve_sample(cu, motionSampleTime);
@@ -270,4 +267,4 @@ Mesh *USDNurbsReader::read_mesh(struct Mesh *existing_mesh,
}
return BKE_mesh_new_nomain_from_curve(m_object);
-}
\ No newline at end of file
+}
diff --git a/source/blender/io/usd/intern/usd_reader_prim.cc b/source/blender/io/usd/intern/usd_reader_prim.cc
index 739bce2d2f3..298542c66dc 100644
--- a/source/blender/io/usd/intern/usd_reader_prim.cc
+++ b/source/blender/io/usd/intern/usd_reader_prim.cc
@@ -81,7 +81,6 @@ bool USDPrimReader::valid() const
void USDPrimReader::createObject(Main *bmain, double motionSampleTime)
{
- WM_reportf(RPT_WARNING, "Creating blender object for prim: %s", m_prim.GetPath().GetText());
m_object = BKE_object_add_only_object(bmain, OB_EMPTY, m_name.c_str());
m_object->empty_drawsize = 0.1f;
m_object->data = NULL;
@@ -89,7 +88,6 @@ void USDPrimReader::createObject(Main *bmain, double motionSampleTime)
void USDPrimReader::readObjectData(Main *bmain, double motionSampleTime)
{
- WM_reportf(RPT_WARNING, "Reading prim data: %s", m_prim.GetPath().GetText());
// m_object = BKE_object_add_only_object(bmain, OB_EMPTY, m_prim_path.c_str());
// m_object->data = NULL;
}
diff --git a/source/blender/io/usd/intern/usd_reader_volume.cc b/source/blender/io/usd/intern/usd_reader_volume.cc
index 173c94e8b7d..2292d2e913a 100644
--- a/source/blender/io/usd/intern/usd_reader_volume.cc
+++ b/source/blender/io/usd/intern/usd_reader_volume.cc
@@ -56,7 +56,6 @@ extern "C" {
void USDVolumeReader::createObject(Main *bmain, double motionSampleTime)
{
- WM_reportf(RPT_WARNING, "Creating volume for prim: %s", m_prim.GetPath().GetText());
Volume *volume = (Volume *)BKE_volume_add(bmain, m_name.c_str());
id_us_min(&volume->id);
@@ -66,8 +65,6 @@ void USDVolumeReader::createObject(Main *bmain, double motionSampleTime)
void USDVolumeReader::readObjectData(Main *bmain, double motionSampleTime)
{
- WM_reportf(RPT_WARNING, "Reading specific volume data: %s", m_prim.GetPath().GetText());
-
m_volume = pxr::UsdVolVolume::Get(m_stage, m_prim.GetPath());
pxr::UsdVolVolume::FieldMap fields = m_volume.GetFieldPaths();
diff --git a/source/blender/io/usd/intern/usd_reader_xform.cc b/source/blender/io/usd/intern/usd_reader_xform.cc
index 1104ddb126d..4459ee5cd43 100644
--- a/source/blender/io/usd/intern/usd_reader_xform.cc
+++ b/source/blender/io/usd/intern/usd_reader_xform.cc
@@ -48,7 +48,6 @@ extern "C" {
void USDXformReader::createObject(Main *bmain, double motionSampleTime)
{
- WM_reportf(RPT_WARNING, "Creating blender object for prim: %s", m_prim.GetPath().GetText());
m_object = BKE_object_add_only_object(bmain, OB_EMPTY, m_name.c_str());
m_object->empty_drawsize = 0.1f;
m_object->data = NULL;
@@ -58,8 +57,6 @@ void USDXformReader::readObjectData(Main *bmain, double motionSampleTime)
{
USDPrimReader::readObjectData(bmain, motionSampleTime);
- WM_reportf(RPT_WARNING, "Reading specific xform data: %s", m_prim.GetPath().GetText());
-
bool is_constant;
float transform_from_usd[4][4];
More information about the Bf-blender-cvs
mailing list