[Bf-blender-cvs] [4acd9ac] alembic_pointcache: Removed unused PTC elements from the blenkernel BKE_pointcache header. All new point cache stuff is in its own pointcache folder to keep it clean.
Lukas Tönne
noreply at git.blender.org
Thu Oct 16 16:53:40 CEST 2014
Commit: 4acd9ac0a48ee41563424eaeef680184f99330a3
Author: Lukas Tönne
Date: Thu Nov 28 11:25:44 2013 +0100
Branches: alembic_pointcache
https://developer.blender.org/rB4acd9ac0a48ee41563424eaeef680184f99330a3
Removed unused PTC elements from the blenkernel BKE_pointcache header.
All new point cache stuff is in its own pointcache folder to keep it
clean.
===================================================================
M source/blender/blenkernel/BKE_particle.h
M source/blender/blenkernel/BKE_pointcache.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index 5fec084..0aee5a3 100644
--- a/source/blender/blenkernel/BKE_particle.h
+++ b/source/blender/blenkernel/BKE_particle.h
@@ -393,4 +393,8 @@ float psys_get_current_display_percentage(struct ParticleSystem *psys);
#define DMCACHE_NOTFOUND -1
#define DMCACHE_ISCHILD -2
+/* Point Cache memory storage */
+
+
+
#endif
diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h
index f18af9d..7d31397 100644
--- a/source/blender/blenkernel/BKE_pointcache.h
+++ b/source/blender/blenkernel/BKE_pointcache.h
@@ -53,7 +53,6 @@
/* Add the blendfile name after blendcache_ */
#define PTCACHE_EXT ".bphys"
-#define PTCACHE_ARCHIVE_EXT ".abc"
#define PTCACHE_PATH "blendcache_"
/* File open options, for BKE_ptcache_file_open */
@@ -94,8 +93,6 @@ struct Scene;
struct SmokeModifierData;
struct SoftBody;
struct RigidBodyWorld;
-struct PTCReader;
-struct PTCWriter;
/* temp structure for read/write */
typedef struct PTCacheData {
@@ -167,10 +164,6 @@ typedef struct PTCacheID {
int (*write_header)(PTCacheFile *pf);
int (*read_header)(PTCacheFile *pf);
- /* XXX just a workaround to get going with existing pointcache, eventually PTCacheID should be redundant */
- struct PTCWriter *(*writer_create)(struct Scene *scene, struct Object *ob, void *calldata);
- struct PTCReader *(*reader_create)(struct Scene *scene, struct Object *ob, void *calldata);
-
struct PointCache *cache;
} PTCacheID;
More information about the Bf-blender-cvs
mailing list