[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23614] trunk/blender/source/blender: UI: Bugfixes

Joshua Leung aligorith at gmail.com
Sat Oct 3 13:23:31 CEST 2009


Revision: 23614
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23614
Author:   aligorith
Date:     2009-10-03 13:23:31 +0200 (Sat, 03 Oct 2009)

Log Message:
-----------
UI: Bugfixes

* #19529: Saving in edit mode causes problems in mode buttons when reopening
* Fixed compiler warning in writefile for mingw
* AnimData for Lamp data was not recognised by RNA

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/blenloader/intern/writefile.c
    trunk/blender/source/blender/makesrna/intern/rna_lamp.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2009-10-03 11:19:14 UTC (rev 23613)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2009-10-03 11:23:31 UTC (rev 23614)
@@ -3902,7 +3902,10 @@
 	
 	/* weak weak... this was only meant as draw flag, now is used in give_base too */
 	ob->flag &= ~OB_FROMGROUP;
-
+	
+	/* editmode doesn't get saved in files, so should get cleared when reloading... */
+	ob->mode &= ~OB_MODE_EDIT;
+	
 	ob->disp.first=ob->disp.last= NULL;
 	
 	ob->adt= newdataadr(fd, ob->adt);

Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c	2009-10-03 11:19:14 UTC (rev 23613)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c	2009-10-03 11:23:31 UTC (rev 23614)
@@ -1102,7 +1102,7 @@
 
 	/* write IK param */
 	if (pose->ikparam) {
-		const char *structname = get_ikparam_name(pose);
+		char *structname = (char *)get_ikparam_name(pose);
 		if (structname)
 			writestruct(wd, DATA, structname, 1, pose->ikparam);
 	}

Modified: trunk/blender/source/blender/makesrna/intern/rna_lamp.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_lamp.c	2009-10-03 11:19:14 UTC (rev 23613)
+++ trunk/blender/source/blender/makesrna/intern/rna_lamp.c	2009-10-03 11:23:31 UTC (rev 23614)
@@ -377,7 +377,10 @@
 	RNA_def_property_boolean_negative_sdna(prop, NULL, "mode", LA_NO_DIFF);
 	RNA_def_property_ui_text(prop, "Diffuse", "Lamp does diffuse shading.");
 	RNA_def_property_update(prop, 0, "rna_Lamp_update");
-
+	
+	/* common */
+	rna_def_animdata_common(srna);
+	
 	/* textures */
 	rna_def_mtex_common(srna, "rna_Lamp_mtex_begin", "rna_Lamp_active_texture_get",
 		"rna_Lamp_active_texture_set", "LampTextureSlot", "rna_Lamp_update");





More information about the Bf-blender-cvs mailing list