[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14939] trunk/blender/source/blender: fix for "[#11004] Adding ram sound and alt-U causes ram to look like HD sound and can lead to crash "

Campbell Barton ideasman42 at gmail.com
Fri May 23 11:58:33 CEST 2008


Revision: 14939
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14939
Author:   campbellbarton
Date:     2008-05-23 11:58:33 +0200 (Fri, 23 May 2008)

Log Message:
-----------
fix for "[#11004] Adding ram sound and alt-U causes ram to look like HD sound and can lead to crash"

Missing call sound_initialize_sounds, cant be added BKE_reset_undo since its in blenderkernel.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/blender.c
    trunk/blender/source/blender/src/space.c

Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c	2008-05-23 09:23:57 UTC (rev 14938)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c	2008-05-23 09:58:33 UTC (rev 14939)
@@ -621,7 +621,8 @@
 	}
 }
 
-/* 1= an undo, -1 is a redo. we have to make sure 'curundo' remains at current situation */
+/* 1= an undo, -1 is a redo. we have to make sure 'curundo' remains at current situation
+ * Note, ALWAYS call sound_initialize_sounds after BKE_undo_step() */
 void BKE_undo_step(int step)
 {
 	

Modified: trunk/blender/source/blender/src/space.c
===================================================================
--- trunk/blender/source/blender/src/space.c	2008-05-23 09:23:57 UTC (rev 14938)
+++ trunk/blender/source/blender/src/space.c	2008-05-23 09:58:33 UTC (rev 14939)
@@ -1080,7 +1080,10 @@
 			if(menu) {
 				short event= pupmenu_col(menu, 20);
 				MEM_freeN(menu);
-				if(event>0) BKE_undo_number(event);
+				if(event>0) {
+					BKE_undo_number(event);
+					sound_initialize_sounds();
+				}
 			}
 		}
 	}





More information about the Bf-blender-cvs mailing list