Blender Git Loki
Git Commits -> Revision 8e95eae
Revision 8e95eae by Antonis Ryakiotakis (gooseberry, gooseberry_farm, hair_immediate_fixes, hair_system, temp_constraint_volume, temp_hair_flow, temp_hair_modifiers, temp_motionpaths, terrible_consequencer, testbuild) September 24, 2014, 14:21 (GMT) |
More undo issue solving. This commit moves sound loading out of library linking. The approach chosen here is to do lazy initialization by basically validating the sound before attaching to the scene. Loading the sound buffer requires a valid Main pointer, which means we have to pass this around in many places. We might also consider caching the waveforms in this way too, but for now we're still using the threaded update. We'll have to test this somewhat to see if it behaves well..There are corner cases which might not be covered. Sounds are muted if we undo during an animation, but this bug existed in master as well. |
Commit Details:
Full Hash: 8e95eae192fd34a346114e96ade1ca078badc56e
Parent Commit: aebcb6a
Lines Changed: +142, -85
16 Modified Paths:
/intern/audaspace/intern/AUD_C-API.cpp (+2, -1) (Diff)
/source/blender/blenkernel/BKE_scene.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_sequencer.h (+3, -3) (Diff)
/source/blender/blenkernel/BKE_sound.h (+2, -6) (Diff)
/source/blender/blenkernel/intern/scene.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+13, -13) (Diff)
/source/blender/blenkernel/intern/sound.c (+14, -25) (Diff)
/source/blender/blenloader/intern/readblenentry.c (+7, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+62, -9) (Diff)
/source/blender/blenloader/intern/readfile.h (+3, -0) (Diff)
/source/blender/editors/screen/screen_ops.c (+1, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+5, -3) (Diff)
/source/blender/editors/space_sequencer/sequencer_edit.c (+21, -16) (Diff)
/source/blender/editors/space_sequencer/sequencer_preview.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_sequencer_api.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_sound.c (+3, -2) (Diff)
/source/blender/blenkernel/BKE_scene.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_sequencer.h (+3, -3) (Diff)
/source/blender/blenkernel/BKE_sound.h (+2, -6) (Diff)
/source/blender/blenkernel/intern/scene.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+13, -13) (Diff)
/source/blender/blenkernel/intern/sound.c (+14, -25) (Diff)
/source/blender/blenloader/intern/readblenentry.c (+7, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+62, -9) (Diff)
/source/blender/blenloader/intern/readfile.h (+3, -0) (Diff)
/source/blender/editors/screen/screen_ops.c (+1, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+5, -3) (Diff)
/source/blender/editors/space_sequencer/sequencer_edit.c (+21, -16) (Diff)
/source/blender/editors/space_sequencer/sequencer_preview.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_sequencer_api.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_sound.c (+3, -2) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021