[Bf-blender-cvs] [7c732da] alembic_pointcache: Moved the new point cache settings DNA data into the existing PointCache struct. Adding new DNA data alongside the existing structs leads to a lot of name conflicts, better try to stay within existing structs and gradually extend/replace struct members.

[Lukas Tönne]

Commit: 7c732da27b5f1963d05cfa4607e3074ee5f51298
Author: Lukas Tönne
Date:   Tue Nov 26 12:24:25 2013 +0100
Branches: alembic_pointcache
https://developer.blender.org/rB7c732da27b5f1963d05cfa4607e3074ee5f51298

Moved the new point cache settings DNA data into the existing PointCache
struct. Adding new DNA data alongside the existing structs leads to
a lot of name conflicts, better try to stay within existing structs and
gradually extend/replace struct members.

===================================================================

M	source/blender/makesdna/DNA_pointcache_types.h

===================================================================

diff --git a/source/blender/makesdna/DNA_pointcache_types.h b/source/blender/makesdna/DNA_pointcache_types.h
index 58858f3..075543c 100644
--- a/source/blender/makesdna/DNA_pointcache_types.h
+++ b/source/blender/makesdna/DNA_pointcache_types.h
@@ -112,8 +112,8 @@ typedef struct PointCache {
 	struct PTCacheEdit *edit;
 	void (*free_edit)(struct PTCacheEdit *edit);	/* free callback */
 
-//	struct PTCWriter *writer;
-//	struct PTCReader *reader;
+	/**** NEW POINTCACHE ****/
+	char cachedir[768];	/* FILE_MAXDIR length */
 } PointCache;
 
 /* pointcache->flag */
@@ -141,13 +141,5 @@ typedef struct PointCache {
 #define PTCACHE_COMPRESS_LZO		1
 #define PTCACHE_COMPRESS_LZMA		2
 
-
-/**** NEW POINTCACHE ****/
-
-/* settings for point caches */
-typedef struct PointCacheSettings {
-	char cachedir[768];	/* FILE_MAXDIR length */
-} PointCacheSettings;
-
 #endif