[Bf-blender-cvs] [42c4f7cf0cf] cycles_procedural_api: rename Procedural::create, Procedural::generate
Kévin Dietrich
noreply at git.blender.org
Wed Sep 9 01:08:21 CEST 2020
Commit: 42c4f7cf0cfc4c9faa40d4f510b6a396b24f3dd9
Author: Kévin Dietrich
Date: Tue Sep 8 04:38:27 2020 +0200
Branches: cycles_procedural_api
https://developer.blender.org/rB42c4f7cf0cfc4c9faa40d4f510b6a396b24f3dd9
rename Procedural::create, Procedural::generate
===================================================================
M intern/cycles/render/alembic.cpp
M intern/cycles/render/alembic.h
M intern/cycles/render/procedural.cpp
M intern/cycles/render/procedural.h
===================================================================
diff --git a/intern/cycles/render/alembic.cpp b/intern/cycles/render/alembic.cpp
index 642643cdeba..e00055d1d62 100644
--- a/intern/cycles/render/alembic.cpp
+++ b/intern/cycles/render/alembic.cpp
@@ -161,7 +161,7 @@ AlembicProcedural::~AlembicProcedural()
}
}
-void AlembicProcedural::create(Scene *scene)
+void AlembicProcedural::generate(Scene *scene)
{
if (!need_update && !need_update_for_frame_change) {
return;
diff --git a/intern/cycles/render/alembic.h b/intern/cycles/render/alembic.h
index 24ba83b3df9..a0fdfab2a36 100644
--- a/intern/cycles/render/alembic.h
+++ b/intern/cycles/render/alembic.h
@@ -71,7 +71,7 @@ class AlembicProcedural : public Procedural {
AlembicProcedural();
~AlembicProcedural();
- void create(Scene *scene);
+ void generate(Scene *scene);
bool use_motion_blur;
ustring filepath;
diff --git a/intern/cycles/render/procedural.cpp b/intern/cycles/render/procedural.cpp
index 72cc90c09e0..0eed2c915c9 100644
--- a/intern/cycles/render/procedural.cpp
+++ b/intern/cycles/render/procedural.cpp
@@ -64,7 +64,7 @@ void ProceduralManager::update(Scene *scene, Progress &progress)
return;
}
- procedural->create(scene);
+ procedural->generate(scene);
}
if (progress.get_cancel()) {
diff --git a/intern/cycles/render/procedural.h b/intern/cycles/render/procedural.h
index e949346b61e..4d4dbd55873 100644
--- a/intern/cycles/render/procedural.h
+++ b/intern/cycles/render/procedural.h
@@ -29,7 +29,7 @@ class Procedural : public Node, public NodeOwner {
NODE_ABSTRACT_DECLARE
explicit Procedural(const NodeType *type);
virtual ~Procedural();
- virtual void create(Scene *scene) = 0;
+ virtual void generate(Scene *scene) = 0;
virtual bool is_procedural() const;
};
More information about the Bf-blender-cvs
mailing list