[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19757] branches/blender2.5/blender/source /blender: 2.5:

[Brecht Van Lommel]

Revision: 19757
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19757
Author:   blendix
Date:     2009-04-16 15:01:50 +0200 (Thu, 16 Apr 2009)

Log Message:
-----------
2.5:
* Also look in ./release for scripts instead of next to executable.
* Some warning fixes.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenlib/intern/util.c
    branches/blender2.5/blender/source/blender/makesdna/DNA_anim_types.h
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_nodetree.c

Modified: branches/blender2.5/blender/source/blender/blenlib/intern/util.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/intern/util.c	2009-04-16 12:49:12 UTC (rev 19756)
+++ branches/blender2.5/blender/source/blender/blenlib/intern/util.c	2009-04-16 13:01:50 UTC (rev 19757)
@@ -832,7 +832,8 @@
  *
  * $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 @@
 		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 @@
 		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;
 }
 

Modified: branches/blender2.5/blender/source/blender/makesdna/DNA_anim_types.h
===================================================================
--- branches/blender2.5/blender/source/blender/makesdna/DNA_anim_types.h	2009-04-16 12:49:12 UTC (rev 19756)
+++ branches/blender2.5/blender/source/blender/makesdna/DNA_anim_types.h	2009-04-16 13:01:50 UTC (rev 19757)
@@ -74,7 +74,7 @@
 	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;

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c	2009-04-16 12:49:12 UTC (rev 19756)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c	2009-04-16 13:01:50 UTC (rev 19757)
@@ -2571,7 +2571,7 @@
 			}
 		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;
 			}

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_nodetree.c	2009-04-16 12:49:12 UTC (rev 19756)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_nodetree.c	2009-04-16 13:01:50 UTC (rev 19757)
@@ -512,7 +512,7 @@
 	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"