diff options
author | Campbell Barton <ideasman42@gmail.com> | 2008-05-23 13:58:33 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2008-05-23 13:58:33 +0400 |
commit | b46bdbcd0fb42c79f9fcac98f917e20635d29e40 (patch) | |
tree | 40ac00d3ac2e81b18aff392de64c28fac92b3bf8 | |
parent | b6ab784c125744dc4c20694a9ecc0530ea2be4e1 (diff) |
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.
-rw-r--r-- | source/blender/blenkernel/intern/blender.c | 3 | ||||
-rw-r--r-- | source/blender/src/space.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 81f496e97d6..aca51e56c6e 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -621,7 +621,8 @@ void BKE_write_undo(char *name) } } -/* 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) { diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 1d07bfbe22a..47e3387755b 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -1080,7 +1080,10 @@ void BIF_undo_menu(void) 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(); + } } } } |