2.5:

* Also look in ./release for scripts instead of next to executable.
* Some warning fixes.

4 files changed, 13 insertions, 5 deletions

diff --git a/source/blender/blenlib/intern/util.c b/source/blender/blenlib/intern/util.c
index 78fc78f67f7..040b2d4027c 100644
--- a/source/blender/blenlib/intern/util.c
+++ b/source/blender/blenlib/intern/util.c
@@ -832,7 +832,8 @@ char *BLI_gethome(void) {
  *
  * $HOME/.blender/folder_name
  * path_to_executable/.blender/folder_name
- * release/folder_name (in svn)
+ * path_to_executable/release/folder_name (in svn)
+ * ./release/folder_name (in svn)
  *
  * returns NULL if none is found. */
 
@@ -911,7 +912,7 @@ char *BLI_gethome_folder(char *folder_name)
 		else return homedir;
 	}
 
-	/* last try for folder_name dir: blender in svn dir, folder_name/ inside release/: */
+	/* try path_to_executable/release/folder_name (in svn) */
 	if (folder_name) {
 		BLI_snprintf(tmpdir, sizeof(tmpdir), "release/%s", folder_name);
 		BLI_make_file_string("/", fulldir, bprogdir, tmpdir);
@@ -919,6 +920,13 @@ char *BLI_gethome_folder(char *folder_name)
 		else fulldir[0] = '\0';
 	}
 
+	/* try ./release/folder_name (in svn) */
+	if(folder_name) {
+		BLI_snprintf(fulldir, sizeof(fulldir), "./release/%s", folder_name);
+		if (BLI_exists(fulldir)) return fulldir;
+		else fulldir[0] = '\0';
+	}
+
 	return NULL;
 }
 
diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h
index e63c30faed0..d015d703309 100644
--- a/source/blender/makesdna/DNA_anim_types.h
+++ b/source/blender/makesdna/DNA_anim_types.h
@@ -74,7 +74,7 @@ typedef struct FMod_Generator {
 	float *coefficients;		/* coefficients array */
 	unsigned int arraysize;		/* size of the coefficients array */
 	
-	unsigned short poly_order;	/* order of polynomial generated (i.e. 1 for linear, 2 for quadratic) */
+	short poly_order;			/* order of polynomial generated (i.e. 1 for linear, 2 for quadratic) */
 	short func_type;			/* builtin math function eFMod_Generator_Functions */
 	
 	int pad;
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 7b42d4afa60..ebe434377ee 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -2571,7 +2571,7 @@ int RNA_function_call_direct_va(PointerRNA *ptr, FunctionRNA *func, const char *
 			}
 		case PROP_FLOAT:
 			{
-				float arg= va_arg(args, float);
+				double arg= va_arg(args, double);
 				err= rna_function_parameter_parse(&funcptr, parm, type, ftype, len, iter.data, &arg, NULL, tid, fid, pid);
 				break;
 			}
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 1b73ae9a1cf..be3e429c1a2 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -512,7 +512,7 @@ void RNA_def_nodetree(BlenderRNA *brna)
 	rna_def_texture_node(brna);
 	
 	#define DefNode(Category, ID, DefFunc, EnumName, StructName, UIName, UIDesc) \
-		define_specific_node(brna, ID, DefFunc ? DefFunc : define_simple_node);
+		define_specific_node(brna, ID, DefFunc != 0 ? DefFunc : define_simple_node);
 		
 	#include "rna_nodetree_types.h"