[Bf-blender-cvs] [517c95e] alembic_pointcache: Removed unused Scene pointer from the base Reader/Writer classes.
Lukas Tönne
noreply at git.blender.org
Tue Feb 24 18:26:58 CET 2015
Commit: 517c95e723ff14e756526400012c9070565c58ac
Author: Lukas Tönne
Date: Tue Feb 24 15:43:10 2015 +0100
Branches: alembic_pointcache
https://developer.blender.org/rB517c95e723ff14e756526400012c9070565c58ac
Removed unused Scene pointer from the base Reader/Writer classes.
===================================================================
M source/blender/pointcache/alembic/abc_cloth.cpp
M source/blender/pointcache/alembic/abc_dynamicpaint.cpp
M source/blender/pointcache/alembic/abc_mesh.cpp
M source/blender/pointcache/alembic/abc_particles.cpp
M source/blender/pointcache/alembic/abc_smoke.cpp
M source/blender/pointcache/alembic/abc_softbody.cpp
M source/blender/pointcache/intern/ptc_types.h
M source/blender/pointcache/intern/reader.cpp
M source/blender/pointcache/intern/reader.h
M source/blender/pointcache/intern/writer.cpp
M source/blender/pointcache/intern/writer.h
===================================================================
diff --git a/source/blender/pointcache/alembic/abc_cloth.cpp b/source/blender/pointcache/alembic/abc_cloth.cpp
index 2a964f9..9c6b8c0 100644
--- a/source/blender/pointcache/alembic/abc_cloth.cpp
+++ b/source/blender/pointcache/alembic/abc_cloth.cpp
@@ -38,7 +38,7 @@ using namespace Abc;
using namespace AbcGeom;
AbcClothWriter::AbcClothWriter(Scene *scene, Object *ob, ClothModifierData *clmd) :
- ClothWriter(scene, ob, clmd, &m_archive),
+ ClothWriter(ob, clmd, &m_archive),
m_archive(scene, ptc_archive_path("//blendcache/", &ob->id, ob->id.lib), m_error_handler)
{
set_error_handler(new ModifierErrorHandler(&clmd->modifier));
@@ -129,7 +129,7 @@ void AbcClothWriter::write_sample()
AbcClothReader::AbcClothReader(Scene *scene, Object *ob, ClothModifierData *clmd) :
- ClothReader(scene, ob, clmd, &m_archive),
+ ClothReader(ob, clmd, &m_archive),
m_archive(scene, ptc_archive_path("//blendcache/", &ob->id, ob->id.lib), m_error_handler)
{
set_error_handler(new ModifierErrorHandler(&clmd->modifier));
diff --git a/source/blender/pointcache/alembic/abc_dynamicpaint.cpp b/source/blender/pointcache/alembic/abc_dynamicpaint.cpp
index dd36ca5..c197f86 100644
--- a/source/blender/pointcache/alembic/abc_dynamicpaint.cpp
+++ b/source/blender/pointcache/alembic/abc_dynamicpaint.cpp
@@ -33,7 +33,7 @@ using namespace Abc;
using namespace AbcGeom;
AbcDynamicPaintWriter::AbcDynamicPaintWriter(Scene *scene, Object *ob, DynamicPaintSurface *surface) :
- DynamicPaintWriter(scene, ob, surface, &m_archive),
+ DynamicPaintWriter(ob, surface, &m_archive),
m_archive(scene, ptc_archive_path("//blendcache/", &ob->id, ob->id.lib), m_error_handler)
{
if (m_archive.archive) {
@@ -52,7 +52,7 @@ void AbcDynamicPaintWriter::write_sample()
AbcDynamicPaintReader::AbcDynamicPaintReader(Scene *scene, Object *ob, DynamicPaintSurface *surface) :
- DynamicPaintReader(scene, ob, surface, &m_archive),
+ DynamicPaintReader(ob, surface, &m_archive),
m_archive(scene, ptc_archive_path("//blendcache/", &ob->id, ob->id.lib), m_error_handler)
{
if (m_archive.archive.valid()) {
diff --git a/source/blender/pointcache/alembic/abc_mesh.cpp b/source/blender/pointcache/alembic/abc_mesh.cpp
index 8c6c789..fcc5e36 100644
--- a/source/blender/pointcache/alembic/abc_mesh.cpp
+++ b/source/blender/pointcache/alembic/abc_mesh.cpp
@@ -45,7 +45,7 @@ using namespace Abc;
using namespace AbcGeom;
AbcPointCacheWriter::AbcPointCacheWriter(Scene *scene, Object *ob, PointCacheModifierData *pcmd) :
- PointCacheWriter(scene, ob, pcmd, &m_archive),
+ PointCacheWriter(ob, pcmd, &m_archive),
m_archive(scene, ptc_archive_path("//blendcache/", &ob->id, ob->id.lib), m_error_handler)
{
set_error_handler(new ModifierErrorHandler(&pcmd->modifier));
@@ -296,7 +296,7 @@ void AbcPointCacheWriter::write_sample()
AbcPointCacheReader::AbcPointCacheReader(Scene *scene, Object *ob, PointCacheModifierData *pcmd) :
- PointCacheReader(scene, ob, pcmd, &m_archive),
+ PointCacheReader(ob, pcmd, &m_archive),
m_archive(scene, ptc_archive_path("//blendcache/", &ob->id, ob->id.lib), m_error_handler)
{
set_error_handler(new ModifierErrorHandler(&pcmd->modifier));
diff --git a/source/blender/pointcache/alembic/abc_particles.cpp b/source/blender/pointcache/alembic/abc_particles.cpp
index 5458af0..cca1a8d 100644
--- a/source/blender/pointcache/alembic/abc_particles.cpp
+++ b/source/blender/pointcache/alembic/abc_particles.cpp
@@ -83,7 +83,7 @@ void AbcParticlesWriter::write_sample()
AbcParticlesReader::AbcParticlesReader(Scene *scene, Object *ob, ParticleSystem *psys) :
- ParticlesReader(scene, ob, psys, &m_archive),
+ ParticlesReader(ob, psys, &m_archive),
m_archive(scene, ptc_archive_path("//blendcache/", &ob->id, ob->id.lib), m_error_handler)
{
if (m_archive.archive.valid()) {
@@ -125,9 +125,7 @@ PTCReadSampleResult AbcParticlesReader::read_sample(float frame)
AbcParticlePathsWriter::AbcParticlePathsWriter(Scene *scene, Object *ob, ParticleSystem *psys, ParticleCacheKey ***pathcache, int *totpath, const std::string &suffix) :
-// ParticlesWriter(scene, ob, psys, &m_archive),
-// m_archive(scene, &ob->id, psys->pointcache, m_error_handler)
- ParticlesWriter(scene, ob, psys, NULL),
+ ParticlesWriter(ob, psys, NULL),
m_pathcache(pathcache),
m_totpath(totpath),
m_suffix(suffix),
@@ -343,7 +341,7 @@ void AbcParticlePathsWriter::write_sample()
AbcParticlePathsReader::AbcParticlePathsReader(Scene *scene, Object *ob, ParticleSystem *psys, ParticleCacheKey ***pathcache, int *totpath, const std::string &suffix) :
- ParticlesReader(scene, ob, psys, &m_archive),
+ ParticlesReader(ob, psys, &m_archive),
m_pathcache(pathcache),
m_totpath(totpath),
m_suffix(suffix),
@@ -474,7 +472,7 @@ PTCReadSampleResult AbcParticlePathsReader::read_sample(float frame)
AbcParticlesCombinedWriter::AbcParticlesCombinedWriter(Scene *scene, Object *ob, ParticleSystem *psys) :
- ParticlesWriter(scene, ob, psys, NULL)
+ ParticlesWriter(ob, psys, NULL)
{
m_particles_writer = NULL;
m_cloth_writer = NULL;
diff --git a/source/blender/pointcache/alembic/abc_smoke.cpp b/source/blender/pointcache/alembic/abc_smoke.cpp
index 6b4faad..5bcd94e 100644
--- a/source/blender/pointcache/alembic/abc_smoke.cpp
+++ b/source/blender/pointcache/alembic/abc_smoke.cpp
@@ -33,7 +33,7 @@ using namespace Abc;
using namespace AbcGeom;
AbcSmokeWriter::AbcSmokeWriter(Scene *scene, Object *ob, SmokeDomainSettings *domain) :
- SmokeWriter(scene, ob, domain, &m_archive),
+ SmokeWriter(ob, domain, &m_archive),
m_archive(scene, ptc_archive_path("//blendcache/", &ob->id, ob->id.lib), m_error_handler)
{
if (m_archive.archive) {
@@ -54,7 +54,7 @@ void AbcSmokeWriter::write_sample()
AbcSmokeReader::AbcSmokeReader(Scene *scene, Object *ob, SmokeDomainSettings *domain) :
- SmokeReader(scene, ob, domain, &m_archive),
+ SmokeReader(ob, domain, &m_archive),
m_archive(scene, ptc_archive_path("//blendcache/", &ob->id, ob->id.lib), m_error_handler)
{
if (m_archive.archive.valid()) {
diff --git a/source/blender/pointcache/alembic/abc_softbody.cpp b/source/blender/pointcache/alembic/abc_softbody.cpp
index fee38b4..5aefbd9 100644
--- a/source/blender/pointcache/alembic/abc_softbody.cpp
+++ b/source/blender/pointcache/alembic/abc_softbody.cpp
@@ -33,7 +33,7 @@ using namespace Abc;
using namespace AbcGeom;
AbcSoftBodyWriter::AbcSoftBodyWriter(Scene *scene, Object *ob, SoftBody *softbody) :
- SoftBodyWriter(scene, ob, softbody, &m_archive),
+ SoftBodyWriter(ob, softbody, &m_archive),
m_archive(scene, ptc_archive_path("//blendcache/", &ob->id, ob->id.lib), m_error_handler)
{
if (m_archive.archive) {
@@ -54,7 +54,7 @@ void AbcSoftBodyWriter::write_sample()
AbcSoftBodyReader::AbcSoftBodyReader(Scene *scene, Object *ob, SoftBody *softbody) :
- SoftBodyReader(scene, ob, softbody, &m_archive),
+ SoftBodyReader(ob, softbody, &m_archive),
m_archive(scene, ptc_archive_path("//blendcache/", &ob->id, ob->id.lib), m_error_handler)
{
if (m_archive.archive.valid()) {
diff --git a/source/blender/pointcache/intern/ptc_types.h b/source/blender/pointcache/intern/ptc_types.h
index e81c052..6eb287d 100644
--- a/source/blender/pointcache/intern/ptc_types.h
+++ b/source/blender/pointcache/intern/ptc_types.h
@@ -36,8 +36,8 @@ namespace PTC {
class ClothWriter : public Writer {
public:
- ClothWriter(Scene *scene, Object *ob, ClothModifierData *clmd, WriterArchive *archive) :
- Writer(scene, (ID *)ob, archive),
+ ClothWriter(Object *ob, ClothModifierData *clmd, WriterArchive *archive) :
+ Writer((ID *)ob, archive),
m_ob(ob),
m_clmd(clmd)
{}
@@ -52,8 +52,8 @@ protected:
class ClothReader : public Reader {
public:
- ClothReader(Scene *scene, Object *ob, ClothModifierData *clmd, ReaderArchive *archive) :
- Reader(scene, (ID *)ob, archive),
+ ClothReader(Object *ob, ClothModifierData *clmd, ReaderArchive *archive) :
+ Reader((ID *)ob, archive),
m_ob(ob),
m_clmd(clmd)
{}
@@ -69,8 +69,8 @@ protected:
class DynamicPaintWriter : public Writer {
public:
- DynamicPaintWriter(Scene *scene, Object *ob, DynamicPaintSurface *surface, WriterArchive *archive) :
- Writer(scene, (ID *)ob, archive),
+ DynamicPaintWriter(Object *ob, DynamicPaintSurface *surface, WriterArchive *archive) :
+ Writer((ID *)ob, archive),
m_ob(ob),
m_surface(surface)
{}
@@ -85,8 +85,8 @@ protected:
class DynamicPaintReader : public Reader {
public:
- DynamicPaintReader(Scene *scene, Object *ob, DynamicPaintSurface *surface, ReaderArchive *archive) :
- Reader(scene, (ID *)ob, archive),
+ DynamicPaintReader(Object *ob, DynamicPaintSurface *surface, ReaderArchive *archive) :
+ Reader((ID *)ob, archive),
m_ob(ob),
m_surface(surface)
{}
@@ -102,8 +102,8 @@ protected:
class PointCacheWriter : public Writer {
public:
- PointCacheWriter(Scene *scene, Object *ob, PointCacheModifierData *pcmd, WriterArchive *archive) :
- Writer(scene, (ID *)ob, archive),
+ PointCacheWriter(Object *ob, PointCacheModifierData *pcmd, WriterArchive *archive) :
+ Writer((ID *)ob, archive),
m_ob(ob),
m_pcmd(pcmd)
{}
@@ -118,8 +118,8 @@ protected:
class PointCacheReader : public Reader {
public:
- PointCacheReader(Scene *scene, Object *ob, PointCacheModifierData *pcmd, ReaderArchive *archive) :
- Reader(scene, (ID *)ob, archive),
+ PointCacheReader(Object *ob, PointCacheModifierData *pcmd, ReaderArchive *archive) :
+ Reader((ID *)ob, archive),
m_ob(ob),
m_pcmd(pcmd),
m_result(0)
@@ -141,8 +141,8 @@ protected:
class ParticlesWriter : public Writer {
public:
- ParticlesWriter(Scene *scene, Object *ob, ParticleSystem *psys, WriterArchive *archive) :
- Writer(scene, (ID *)ob, archive),
+ ParticlesWriter(Object *ob, ParticleSystem *psys, WriterArchive *archive) :
+ Writer((ID *)ob, archive),
m_ob(ob),
m_psys(psys)
{}
@@ -157,8 +157,8 @@ protected:
class ParticlesReader : public Reader {
public:
- ParticlesReader(Scene *scene, Object *ob, ParticleSystem *psys, ReaderArchive *archi
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list