[Bf-blender-cvs] [caa726dd29c] cycles_procedural_api: cleanup, remove Node::time_stamp
Kévin Dietrich
noreply at git.blender.org
Mon Nov 16 13:10:26 CET 2020
Commit: caa726dd29ce6842b390750e4c9334edbf93e522
Author: Kévin Dietrich
Date: Mon Nov 9 16:08:26 2020 +0100
Branches: cycles_procedural_api
https://developer.blender.org/rBcaa726dd29ce6842b390750e4c9334edbf93e522
cleanup, remove Node::time_stamp
===================================================================
M intern/cycles/blender/blender_mesh.cpp
M intern/cycles/graph/node.cpp
M intern/cycles/graph/node.h
M intern/cycles/render/alembic.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp
index 30ff17c23f1..3b5bfcef99b 100644
--- a/intern/cycles/blender/blender_mesh.cpp
+++ b/intern/cycles/blender/blender_mesh.cpp
@@ -1019,10 +1019,6 @@ static void sync_mesh_fluid_motion(BL::Object &b_ob, Scene *scene, Mesh *mesh)
void BlenderSync::sync_mesh(BL::Depsgraph b_depsgraph, BL::Object b_ob, Mesh *mesh)
{
- if (mesh->get_time_stamp() == b_depsgraph.scene().frame_current()) {
- return;
- }
-
/* make a copy of the shaders as the caller in the main thread still need them for syncing the
* attributes */
array<Node *> used_shaders = mesh->get_used_shaders();
@@ -1103,7 +1099,6 @@ void BlenderSync::sync_mesh(BL::Depsgraph b_depsgraph, BL::Object b_ob, Mesh *me
}
mesh->set_num_subd_faces(new_mesh.get_num_subd_faces());
- mesh->set_time_stamp(b_depsgraph.scene().frame_current());
/* tag update */
bool rebuild = (mesh->triangles_is_modified()) || (mesh->subd_num_corners_is_modified()) ||
diff --git a/intern/cycles/graph/node.cpp b/intern/cycles/graph/node.cpp
index e682153fa58..c926f6ab8ef 100644
--- a/intern/cycles/graph/node.cpp
+++ b/intern/cycles/graph/node.cpp
@@ -36,7 +36,6 @@ Node::Node(const NodeType *type_, ustring name_) : name(name_), type(type_)
owner = nullptr;
tag_modified();
- time_stamp = -1;
/* assign non-empty name, convenient for debugging */
if (name.empty()) {
@@ -826,14 +825,4 @@ void Node::print_modified_sockets() const
}
}
-int Node::get_time_stamp() const
-{
- return time_stamp;
-}
-
-void Node::set_time_stamp(int time_stamp_)
-{
- time_stamp = time_stamp_;
-}
-
CCL_NAMESPACE_END
diff --git a/intern/cycles/graph/node.h b/intern/cycles/graph/node.h
index 32aee54c350..2fc9a1e0281 100644
--- a/intern/cycles/graph/node.h
+++ b/intern/cycles/graph/node.h
@@ -171,9 +171,6 @@ struct Node {
void print_modified_sockets() const;
- int get_time_stamp() const;
- void set_time_stamp(int time_stamp_);
-
ustring name;
const NodeType *type;
@@ -182,7 +179,6 @@ struct Node {
protected:
const NodeOwner *owner;
- int time_stamp;
template<typename T> static T &get_socket_value(const Node *node, const SocketType &socket)
{
diff --git a/intern/cycles/render/alembic.cpp b/intern/cycles/render/alembic.cpp
index 72bd25db547..b7c072a8a54 100644
--- a/intern/cycles/render/alembic.cpp
+++ b/intern/cycles/render/alembic.cpp
@@ -575,11 +575,6 @@ void AlembicProcedural::read_mesh(Scene *scene,
}
// TODO : properly check if and what data needs to be rebuild
- if (mesh->get_time_stamp() == static_cast<int>(frame)) {
- return;
- }
-
- mesh->set_time_stamp(static_cast<int>(frame));
IPolyMeshSchema schema = polymesh.getSchema();
More information about the Bf-blender-cvs
mailing list