anim.c, buttons_object.c, readfile.c, BKE_blender.h - dupliFace scale option, needed for leaves.

modifier.c, BKE_modifier.h - flag for modifiers to say they use pointcache, also new func modifiers_usesPointCache
renamed //pointcache to //blendcache_blendfilename so blendfiles in the same dir dont conflict, and other to show this dir isnt limited to pointcache only (nodes way want to use this)
wizard_curve2tree.py - better defaults for pretty tree's

6 files changed, 47 insertions, 6 deletions

diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h
index 075405b1097..1f8d5e44c96 100644
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -44,7 +44,7 @@ struct ListBase;
 struct MemFile;
 
 #define BLENDER_VERSION			245
-#define BLENDER_SUBVERSION		9
+#define BLENDER_SUBVERSION		10
 
 #define BLENDER_MINVERSION		240
 #define BLENDER_MINSUBVERSION	0
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index 24da941db90..931f0e12fd4 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -85,6 +85,10 @@ typedef enum {
 	 * be placed after any non-deformative modifier.
 	 */
 	eModifierTypeFlag_RequiresOriginalData = (1<<5),
+
+	/* For modifiers that support pointcache, so we can check to see if it has files we need to deal with
+	*/
+	eModifierTypeFlag_UsesPointCache = (1<<6),
 } ModifierTypeFlag;
 
 typedef void (*ObjectWalkFunc)(void *userData, struct Object *ob, struct Object **obpoin);
diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h
index efd727d2141..52cc0ddcaa7 100644
--- a/source/blender/blenkernel/BKE_pointcache.h
+++ b/source/blender/blenkernel/BKE_pointcache.h
@@ -38,9 +38,15 @@
 #define PTCACHE_CLEAR_BEFORE	2
 #define PTCACHE_CLEAR_AFTER		3
 
+/* Add the blendfile name after blendcache_ */
 #define PTCACHE_EXT ".bphys"
-#define PTCACHE_PATH "//pointcache/"
+#define PTCACHE_PATH "//blendcache_"
 
+/* Global funcs */
+/* void BKE_ptcache_clean(void); - not implimented yet! */
+
+
+/* Object spesific funcs */
 int		BKE_ptcache_id_filename(struct ID *id, char *filename, int cfra, int stack_index, short do_path, short do_ext);
 FILE *	BKE_ptcache_id_fopen(struct ID *id, char mode, int cfra, int stack_index);
 void	BKE_ptcache_id_clear(struct ID *id, char mode, int cfra, int stack_index);
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index 43168733b3f..87bba6abca8 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -538,7 +538,7 @@ static void face_duplilist(ListBase *lb, Scene *sce, Object *par)
 						/* scale */
 						if(par->transflag & OB_DUPLIFACES_SCALE) {
 							float size= v4?AreaQ3Dfl(v1, v2, v3, v4):AreaT3Dfl(v1, v2, v3);
-							size= sqrt(size);
+							size= sqrt(size) * par->dupfacesca;
 							Mat3MulFloat(mat[0], size);
 						}
 						
diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index 6fa4fb6b3cc..fadc41b3042 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -6739,7 +6739,9 @@ ModifierTypeInfo *modifierType_getInfo(ModifierType type)
 
 		mti = INIT_TYPE(Boolean);
 		mti->type = eModifierTypeType_Nonconstructive;
-		mti->flags = eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_RequiresOriginalData;
+		mti->flags = eModifierTypeFlag_AcceptsMesh
+					 | eModifierTypeFlag_RequiresOriginalData
+					 | eModifierTypeFlag_UsesPointCache;
 		mti->copyData = booleanModifier_copyData;
 		mti->isDisabled = booleanModifier_isDisabled;
 		mti->applyModifier = booleanModifier_applyModifier;
@@ -6763,7 +6765,8 @@ ModifierTypeInfo *modifierType_getInfo(ModifierType type)
 		mti = INIT_TYPE(ParticleSystem);
 		mti->type = eModifierTypeType_OnlyDeform;
 		mti->flags = eModifierTypeFlag_AcceptsMesh
-					| eModifierTypeFlag_SupportsMapping;
+					| eModifierTypeFlag_SupportsMapping
+					| eModifierTypeFlag_UsesPointCache;
 #if 0
 					| eModifierTypeFlag_SupportsEditmode;
 					|eModifierTypeFlag_EnableInEditmode;
@@ -7192,3 +7195,15 @@ int modifiers_indexInObject(Object *ob, ModifierData *md_seek)
 	return i;
 }
 
+int modifiers_usesPointCache(Object *ob)
+{
+	ModifierData *md = ob->modifiers.first;
+
+	for (; md; md=md->next) {
+		ModifierTypeInfo *mti = modifierType_getInfo(md->type);
+		if (mti->flags & eModifierTypeFlag_UsesPointCache) {
+			return 1;
+		}
+	}
+	return 0;
+}
\ No newline at end of file
diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c
index c4ef437019e..2afcf19427c 100644
--- a/source/blender/blenkernel/intern/pointcache.c
+++ b/source/blender/blenkernel/intern/pointcache.c
@@ -59,7 +59,17 @@
 
 static int ptcache_path(char *filename)
 {
-	sprintf(filename, PTCACHE_PATH);
+	char dir[FILE_MAX], file[FILE_MAX]; /* we dont want the dir, only the file */
+	int i;
+	
+	BLI_split_dirfile(G.sce, dir, file);
+	i = strlen(file);
+	
+	/* remove .blend */
+	if (i > 6)
+		file[i-6] = '\0';
+	
+	sprintf(filename, PTCACHE_PATH"%s/", file); /* add blend file name to pointcache dir */
 	BLI_convertstringcode(filename, G.sce, 0);
 	return strlen(filename);
 }
@@ -72,6 +82,8 @@ int BKE_ptcache_id_filename(struct ID *id, char *filename, int cfra, int stack_i
 	filename[0] = '\0';
 	newname = filename;
 	
+	if (!G.relbase_valid) return 0; /* save blend fiel before using pointcache */
+	
 	/* start with temp dir */
 	if (do_path) {
 		len = ptcache_path(filename);
@@ -100,6 +112,8 @@ FILE *BKE_ptcache_id_fopen(struct ID *id, char mode, int cfra, int stack_index)
 	FILE *fp = NULL;
 	char filename[(FILE_MAXDIR+FILE_MAXFILE)*2];
 
+	if (!G.relbase_valid) return NULL; /* save blend fiel before using pointcache */
+	
 	BKE_ptcache_id_filename(id, filename, cfra, stack_index, 1, 1);
 
 	if (mode=='r') {
@@ -135,6 +149,8 @@ void BKE_ptcache_id_clear(struct ID *id, char mode, int cfra, int stack_index)
 	char filename[(FILE_MAXDIR+FILE_MAXFILE)*2];
 	char path_full[(FILE_MAXDIR+FILE_MAXFILE)*2];
 	
+	if (!G.relbase_valid) return; /* save blend fiel before using pointcache */
+	
 	/* clear all files in the temp dir with the prefix of the ID and the ".bphys" suffix */
 	switch (mode) {
 	case PTCACHE_CLEAR_ALL: