[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26148] trunk/blender/source/blender: Bugfix: copying drivers did not set compiled expression to NULL, also tweak

[Brecht Van Lommel]

Revision: 26148
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26148
Author:   blendix
Date:     2010-01-20 19:27:19 +0100 (Wed, 20 Jan 2010)

Log Message:
-----------
Bugfix: copying drivers did not set compiled expression to NULL, also tweak
to set it to NULL on file read instead of write as is done usually.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/fcurve.c
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/blenloader/intern/writefile.c

Modified: trunk/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/fcurve.c	2010-01-20 17:41:41 UTC (rev 26147)
+++ trunk/blender/source/blender/blenkernel/intern/fcurve.c	2010-01-20 18:27:19 UTC (rev 26148)
@@ -1205,6 +1205,7 @@
 		
 	/* copy all data */
 	ndriver= MEM_dupallocN(driver);
+	ndriver->expr_comp= NULL;
 	
 	/* copy variables */
 	ndriver->variables.first= ndriver->variables.last= NULL;

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2010-01-20 17:41:41 UTC (rev 26147)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2010-01-20 18:27:19 UTC (rev 26148)
@@ -1780,6 +1780,8 @@
 		if (fcu->driver) {
 			ChannelDriver *driver= fcu->driver;
 			DriverVar *dvar;
+
+			driver->expr_comp= NULL;
 			
 			/* relink variables, targets and their paths */
 			link_list(fd, &driver->variables);

Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c	2010-01-20 17:41:41 UTC (rev 26147)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c	2010-01-20 18:27:19 UTC (rev 26148)
@@ -935,15 +935,8 @@
 			ChannelDriver *driver= fcu->driver;
 			DriverVar *dvar;
 			
-			/* don't save compiled python bytecode */
-			void *expr_comp= driver->expr_comp;
-			driver->expr_comp= NULL;
-			
 			writestruct(wd, DATA, "ChannelDriver", 1, driver);
 			
-			driver->expr_comp= expr_comp; /* restore */
-			
-			
 			/* variables */
 			for (dvar= driver->variables.first; dvar; dvar= dvar->next) {
 				writestruct(wd, DATA, "DriverVar", 1, dvar);