[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28069] branches/render25/source/blender: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/ blender -r28064:28068

[Brecht Van Lommel]

Revision: 28069
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28069
Author:   blendix
Date:     2010-04-07 12:26:53 +0200 (Wed, 07 Apr 2010)

Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28064:28068

Modified Paths:
--------------
    branches/render25/source/blender/blenkernel/intern/blender.c
    branches/render25/source/blender/blenloader/intern/readfile.c
    branches/render25/source/blender/editors/mesh/mesh_ops.c

Modified: branches/render25/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/blender.c	2010-04-07 10:25:43 UTC (rev 28068)
+++ branches/render25/source/blender/blenkernel/intern/blender.c	2010-04-07 10:26:53 UTC (rev 28069)
@@ -291,10 +291,13 @@
 		/* in case of autosave or quit.blend, use original filename instead
 		 * use relbase_valid to make sure the file is saved, else we get <memory2> in the filename */
 		filename= bfd->filename;
-	} else if (!G.relbase_valid) {
+	}
+#if 0
+	else if (!G.relbase_valid) {
 		/* otherwise, use an empty string as filename, rather than <memory2> */
 		filename="";
 	}
+#endif
 	
 	/* these are the same at times, should never copy to the same location */
 	if(G.sce != filename)

Modified: branches/render25/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/render25/source/blender/blenloader/intern/readfile.c	2010-04-07 10:25:43 UTC (rev 28068)
+++ branches/render25/source/blender/blenloader/intern/readfile.c	2010-04-07 10:26:53 UTC (rev 28069)
@@ -4835,6 +4835,9 @@
 					sima->image= restore_pointer_by_name(newmain, (ID *)sima->image, 1);
 
 					sima->scopes.samples_ibuf = NULL;
+					sima->scopes.waveform_1 = NULL;
+					sima->scopes.waveform_2 = NULL;
+					sima->scopes.waveform_3 = NULL;
 					sima->scopes.ok = 0;
 					
 					/* NOTE: pre-2.5, this was local data not lib data, but now we need this as lib data
@@ -5109,6 +5112,9 @@
 				sima->iuser.scene= NULL;
 				sima->iuser.ok= 1;
 				sima->scopes.samples_ibuf = NULL;
+				sima->scopes.waveform_1 = NULL;
+				sima->scopes.waveform_2 = NULL;
+				sima->scopes.waveform_3 = NULL;
 				sima->scopes.ok = 0;
 				
 				/* WARNING: gpencil data is no longer stored directly in sima after 2.5 

Modified: branches/render25/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- branches/render25/source/blender/editors/mesh/mesh_ops.c	2010-04-07 10:25:43 UTC (rev 28068)
+++ branches/render25/source/blender/editors/mesh/mesh_ops.c	2010-04-07 10:26:53 UTC (rev 28069)
@@ -296,9 +296,6 @@
 	WM_keymap_add_item(keymap, "MESH_OT_delete", XKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_item(keymap, "MESH_OT_delete", DELKEY, KM_PRESS, 0, 0);
 	
-	WM_keymap_add_item(keymap, "MESH_OT_fgon_make", FKEY, KM_PRESS, KM_ALT, 0);
-	WM_keymap_add_item(keymap, "MESH_OT_fgon_clear", FKEY, KM_PRESS, KM_SHIFT|KM_ALT, 0);
-	
 	WM_keymap_add_item(keymap, "MESH_OT_knife_cut", LEFTMOUSE, KM_PRESS, 0, KKEY);
 	RNA_enum_set(WM_keymap_add_item(keymap, "MESH_OT_knife_cut", LEFTMOUSE, KM_PRESS, KM_SHIFT, KKEY)->ptr, "type", 2/*KNIFE_MIDPOINT*/);