[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24874] trunk/blender/source/blender: Assorted fixes - compile + drivers:

[Joshua Leung]

Revision: 24874
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24874
Author:   aligorith
Date:     2009-11-25 10:25:58 +0100 (Wed, 25 Nov 2009)

Log Message:
-----------
Assorted fixes - compile + drivers:
* Fixed a few compile warnings for scons+mingw
* Driver variables are now added with the ID-type set to ID_OB (objects) by default since this is more convenient

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/fcurve.c
    trunk/blender/source/blender/blenkernel/intern/sequence.c
    trunk/blender/source/blender/editors/animation/drivers.c
    trunk/blender/source/blender/editors/interface/interface_draw.c
    trunk/blender/source/blender/editors/object/object_vgroup.c
    trunk/blender/source/blender/python/intern/bpy_rna.c

Modified: trunk/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fcurve.c	2009-11-25 08:28:57 UTC (rev 24873)
+++ trunk/blender/source/blender/blenkernel/intern/fcurve.c	2009-11-25 09:25:58 UTC (rev 24874)
@@ -731,6 +731,9 @@
 	dtar= MEM_callocN(sizeof(DriverTarget), "DriverTarget");
 	BLI_addtail(&driver->targets, dtar);
 	
+	/* make the default ID-type ID_OB, since most driver targets refer to objects */
+	dtar->idtype= ID_OB;
+	
 	/* give the target a 'unique' name */
 	strcpy(dtar->name, "var");
 	BLI_uniquename(&driver->targets, dtar, "var", '_', offsetof(DriverTarget, name), 64);

Modified: trunk/blender/source/blender/blenkernel/intern/sequence.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequence.c	2009-11-25 08:28:57 UTC (rev 24873)
+++ trunk/blender/source/blender/blenkernel/intern/sequence.c	2009-11-25 09:25:58 UTC (rev 24874)
@@ -2007,7 +2007,7 @@
 			}
 		}
 	} else if(seq->type == SEQ_SCENE) {	// scene can be NULL after deletions
-		Scene *sce= seq->scene, *oldsce= scene;
+		Scene *sce= seq->scene;// *oldsce= scene;
 		Render *re;
 		RenderResult rres;
 		char scenename[64];

Modified: trunk/blender/source/blender/editors/animation/drivers.c
===================================================================
--- trunk/blender/source/blender/editors/animation/drivers.c	2009-11-25 08:28:57 UTC (rev 24873)
+++ trunk/blender/source/blender/editors/animation/drivers.c	2009-11-25 09:25:58 UTC (rev 24874)
@@ -53,6 +53,7 @@
 #include "BKE_animsys.h"
 #include "BKE_action.h"
 #include "BKE_constraint.h"
+#include "BKE_depsgraph.h"
 #include "BKE_fcurve.h"
 #include "BKE_utildefines.h"
 #include "BKE_context.h"
@@ -175,14 +176,17 @@
 		fcu= verify_driver_fcurve(id, rna_path, array_index, 1);
 		
 		if (fcu && fcu->driver) {
-			fcu->driver->type= type;
+			ChannelDriver *driver= fcu->driver;
 			
+			/* set the type of the driver */
+			driver->type= type;
+			
 			/* fill in current value for python */
 			if (type == DRIVER_TYPE_PYTHON) {
 				PropertyType proptype= RNA_property_type(prop);
 				int array= RNA_property_array_length(&ptr, prop);
-				char *expression= fcu->driver->expression;
-				int val, maxlen= sizeof(fcu->driver->expression);
+				char *expression= driver->expression;
+				int val, maxlen= sizeof(driver->expression);
 				float fval;
 				
 				if (proptype == PROP_BOOLEAN) {

Modified: trunk/blender/source/blender/editors/interface/interface_draw.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_draw.c	2009-11-25 08:28:57 UTC (rev 24873)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c	2009-11-25 09:25:58 UTC (rev 24874)
@@ -468,8 +468,8 @@
 	extern char datatoc_splash_png[];
 	extern int datatoc_splash_png_size;
 	ImBuf *ibuf;
-	GLint scissor[4];
-	int w, h;
+	//GLint scissor[4];
+	//int w, h;
 	
 	/* hardcoded to splash, loading and freeing every draw, eek! */
 	ibuf= IMB_ibImageFromMemory((int *)datatoc_splash_png, datatoc_splash_png_size, IB_rect);

Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c	2009-11-25 08:28:57 UTC (rev 24873)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c	2009-11-25 09:25:58 UTC (rev 24874)
@@ -1786,4 +1786,5 @@
 	/* properties */
 	prop= RNA_def_enum(ot->srna, "group", vgroup_items, 0, "Group", "Vertex group to set as active.");
 	RNA_def_enum_funcs(prop, vgroup_itemf);
-}
\ No newline at end of file
+}
+

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c	2009-11-25 08:28:57 UTC (rev 24873)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2009-11-25 09:25:58 UTC (rev 24874)
@@ -1473,7 +1473,7 @@
 static PyObject *pyrna_prop_path_to_id(BPy_PropertyRNA *self)
 {
 	char *path;
-	PropertyRNA *prop;
+	PropertyRNA *prop = self->prop;
 	PyObject *ret;
 
 	path= RNA_path_from_ID_to_property(&self->ptr, self->prop);