Commit: 325f6bd22392ec3d8bcde008b86d972792c1cd6f
Author: makowalski
Date: Sun May 9 23:05:20 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rB325f6bd22392ec3d8bcde008b86d972792c1cd6f
USD import: remove unused code.
Removed unused mesh sequence modifier enums
and unused velocity scale parameters in the
mesh reading function declarations.
===================================================================
M source/blender/io/usd/intern/usd_capi_import.cc
M source/blender/io/usd/intern/usd_reader_curve.cc
M source/blender/io/usd/intern/usd_reader_curve.h
M source/blender/io/usd/intern/usd_reader_geom.h
M source/blender/io/usd/intern/usd_reader_mesh.cc
M source/blender/io/usd/intern/usd_reader_mesh.h
M source/blender/io/usd/intern/usd_reader_nurbs.cc
M source/blender/io/usd/intern/usd_reader_nurbs.h
M source/blender/io/usd/usd.h
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/intern/MOD_meshsequencecache.c
===================================================================
diff --git a/source/blender/io/usd/intern/usd_capi_import.cc
b/source/blender/io/usd/intern/usd_capi_import.cc
index 3a3154462c7..636d176c8d8 100644
--- a/source/blender/io/usd/intern/usd_capi_import.cc
+++ b/source/blender/io/usd/intern/usd_capi_import.cc
@@ -452,8 +452,7 @@ Mesh *USD_read_mesh(CacheReader *reader,
Mesh *existing_mesh,
const float time,
const char **err_str,
- int read_flag,
- float vel_fac)
+ int read_flag)
{
USDGeomReader *usd_reader = dynamic_cast<USDGeomReader
*>(get_usd_reader(reader, ob, err_str));
@@ -461,7 +460,7 @@ Mesh *USD_read_mesh(CacheReader *reader,
return NULL;
}
- return usd_reader->read_mesh(existing_mesh, time, read_flag, vel_fac,
err_str);
+ return usd_reader->read_mesh(existing_mesh, time, read_flag, err_str);
}
bool USD_mesh_topology_changed(
diff --git a/source/blender/io/usd/intern/usd_reader_curve.cc
b/source/blender/io/usd/intern/usd_reader_curve.cc
index 177ac97eb5d..0d2097c6f7c 100644
--- a/source/blender/io/usd/intern/usd_reader_curve.cc
+++ b/source/blender/io/usd/intern/usd_reader_curve.cc
@@ -200,7 +200,6 @@ void USDCurvesReader::read_curve_sample(Curve *cu, const
double motionSampleTime
Mesh *USDCurvesReader::read_mesh(struct Mesh *existing_mesh,
const double motionSampleTime,
const int /* read_flag */,
- const float /* vel_scale */,
const char ** /* err_str */)
{
if (!curve_prim_) {
diff --git a/source/blender/io/usd/intern/usd_reader_curve.h
b/source/blender/io/usd/intern/usd_reader_curve.h
index eb74b167504..b8bb7bc82e6 100644
--- a/source/blender/io/usd/intern/usd_reader_curve.h
+++ b/source/blender/io/usd/intern/usd_reader_curve.h
@@ -50,7 +50,6 @@ class USDCurvesReader : public USDGeomReader {
Mesh *read_mesh(struct Mesh *existing_mesh,
double motionSampleTime,
int read_flag,
- float vel_scale,
const char **err_str) override;
};
diff --git a/source/blender/io/usd/intern/usd_reader_geom.h
b/source/blender/io/usd/intern/usd_reader_geom.h
index 3698492677a..ce669a5a0ee 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.h
+++ b/source/blender/io/usd/intern/usd_reader_geom.h
@@ -35,7 +35,6 @@ class USDGeomReader : public USDXformReader {
virtual Mesh *read_mesh(struct Mesh *existing_mesh,
double motionSampleTime,
int read_flag,
- float vel_scale,
const char **err_str) = 0;
virtual bool topology_changed(Mesh * /* existing_mesh */, double /*
motionSampleTime */)
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc
b/source/blender/io/usd/intern/usd_reader_mesh.cc
index a8ac4de8100..3add602f937 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.cc
+++ b/source/blender/io/usd/intern/usd_reader_mesh.cc
@@ -221,7 +221,7 @@ void USDMeshReader::read_object_data(Main *bmain, const
double motionSampleTime)
is_initial_load_ = true;
Mesh *read_mesh = this->read_mesh(
- mesh, motionSampleTime, import_params_.global_read_flag, 1.0f, NULL);
+ mesh, motionSampleTime, import_params_.global_read_flag, NULL);
is_initial_load_ = false;
if (read_mesh != mesh) {
@@ -758,7 +758,6 @@ void USDMeshReader::readFaceSetsSample(Main *bmain, Mesh
*mesh, const double mot
Mesh *USDMeshReader::read_mesh(Mesh *existing_mesh,
const double motionSampleTime,
const int read_flag,
- const float vel_scale,
const char ** /* err_str */)
{
if (!mesh_prim_) {
@@ -820,7 +819,6 @@ Mesh *USDMeshReader::read_mesh(Mesh *existing_mesh,
/* Only read point data when streaming meshes, unless we need to create new
ones. */
ImportSettings settings;
settings.read_flag |= read_flag;
- settings.vel_scale = vel_scale;
if (topology_changed(existing_mesh, motionSampleTime)) {
new_mesh = true;
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.h
b/source/blender/io/usd/intern/usd_reader_mesh.h
index 7b00f5aa581..6a645f01bbb 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.h
+++ b/source/blender/io/usd/intern/usd_reader_mesh.h
@@ -63,7 +63,6 @@ class USDMeshReader : public USDGeomReader {
struct Mesh *read_mesh(struct Mesh *existing_mesh,
double motionSampleTime,
int read_flag,
- float vel_scale,
const char **err_str) override;
bool topology_changed(Mesh *existing_mesh, double motionSampleTime) override;
diff --git a/source/blender/io/usd/intern/usd_reader_nurbs.cc
b/source/blender/io/usd/intern/usd_reader_nurbs.cc
index e22ccc0e9dd..7ace62ad804 100644
--- a/source/blender/io/usd/intern/usd_reader_nurbs.cc
+++ b/source/blender/io/usd/intern/usd_reader_nurbs.cc
@@ -201,7 +201,6 @@ void USDNurbsReader::read_curve_sample(Curve *cu, const
double motionSampleTime)
Mesh *USDNurbsReader::read_mesh(struct Mesh * /* existing_mesh */,
const double motionSampleTime,
const int /* read_flag */,
- const float /* vel_scale */,
const char ** /* err_str */)
{
pxr::UsdGeomCurves curve_prim_(prim_);
diff --git a/source/blender/io/usd/intern/usd_reader_nurbs.h
b/source/blender/io/usd/intern/usd_reader_nurbs.h
index 5b06ff52dde..75c98119762 100644
--- a/source/blender/io/usd/intern/usd_reader_nurbs.h
+++ b/source/blender/io/usd/intern/usd_reader_nurbs.h
@@ -50,7 +50,6 @@ class USDNurbsReader : public USDGeomReader {
Mesh *read_mesh(struct Mesh *existing_mesh,
double motionSampleTime,
int read_flag,
- float vel_scale,
const char **err_str) override;
};
diff --git a/source/blender/io/usd/usd.h b/source/blender/io/usd/usd.h
index a57f5bb821f..59399babcc6 100644
--- a/source/blender/io/usd/usd.h
+++ b/source/blender/io/usd/usd.h
@@ -109,8 +109,7 @@ struct Mesh *USD_read_mesh(struct CacheReader *reader,
struct Mesh *current_mesh,
const float time,
const char **err_str,
- int flags,
- float vel_scale);
+ int flags);
bool USD_mesh_topology_changed(struct CacheReader *reader,
struct Object *ob,
diff --git a/source/blender/makesdna/DNA_modifier_types.h
b/source/blender/makesdna/DNA_modifier_types.h
index 533a2223a04..ca6f1467d9c 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -2125,10 +2125,8 @@ typedef struct MeshSeqCacheModifierData {
/** 1024 = FILE_MAX. */
char object_path[1024];
- float vel_fac;
-
char read_flag;
- char _pad[7];
+ char _pad[3];
float velocity_scale;
@@ -2166,11 +2164,7 @@ enum {
* the mesh topology changes, but this heuristic sometimes fails. In these
cases, users can
* disable interpolation with this flag. */
MOD_MESHSEQ_INTERPOLATE_VERTICES = (1 << 4),
- MOD_MESHSEQ_READ_ATTR = (1 << 5),
- MOD_MESHSEQ_READ_VELS = (1 << 6),
};
-// USD Import re-added attr and vel. We are unsure as to why they were removed
-// They are necessary for full USD Import of data
typedef struct SDefBind {
unsigned int *vert_inds;
diff --git a/source/blender/makesrna/intern/rna_modifier.c
b/source/blender/makesrna/intern/rna_modifier.c
index 790a773f03c..67335b81a31 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -6139,12 +6139,8 @@ static void rna_def_modifier_meshseqcache(BlenderRNA
*brna)
{MOD_MESHSEQ_READ_POLY, "POLY", 0, "Faces", ""},
{MOD_MESHSEQ_READ_UV, "UV", 0, "UV", ""},
{MOD_MESHSEQ_READ_COLOR, "COLOR", 0, "Color", ""},
- {MOD_MESHSEQ_READ_ATTR, "ATTR", 0, "Attributes", ""},
- {MOD_MESHSEQ_READ_VELS, "VELS", 0, "Velocities", ""},
{0, NULL, 0, NULL, NULL},
};
- // USD Import re-added these. We are unsure as to why they were removed
- // They are necessary for full USD Import of data
prop = RNA_def_property(srna, "read_data", PROP_ENUM, PROP_NONE);
RNA_def_property_flag(prop, PROP_ENUM_FLAG);
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c
b/source/blender/modifiers/intern/MOD_meshsequencecache.c
index 83bddc00000..1638806ef66 100644
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.c
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c
@@ -81,7 +81,6 @@ static void initData(ModifierData *md)
mcmd->cache_file = NULL;
mcmd->object_path[0] = '\0';
- mcmd->vel_fac = 1.0f;
mcmd->read_flag = MOD_MESHSEQ_READ_ALL;
MEMCPY_STRUCT_AFTER(mcmd, DNA_struct_default_get(MeshSeqCacheModifierData),
modifier);
@@ -200,7 +199,7 @@ static Mesh *modifyMesh(ModifierData *md, const
ModifierEvalContext *ctx, Mesh *
case CACHEFILE_TYPE_USD:
# ifdef WITH_USD
result = USD_read_mesh(
- mcmd->reader, ctx->object, mesh, time * FPS, &err_str,
mcmd->read_flag, mcmd->vel_fac);
+ mcmd->reader, ctx->object, mesh, time * FPS, &err_str,
mcmd->read_flag);
# endif
break;
case CACHE_FILE_TYPE_INVALID:
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
