blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Fix T50240: Rendering crashes when synced to JACK Transport 

Disabling synchronization while rendering.
Using G.is_rendering as suggested by bastien. ;-)
This commit is contained in:
Joerg Mueller 2016-12-27 20:47:01 +01:00
parent 752a783fa4
commit d874b40a55
Notes: blender-bot 2023-02-14 09:09:43 +01:00 
Referenced by issue #50240, Rendering crashes when synced to JACK Transport
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/sound.c
View File

@ -167,6 +167,10 @@ static const char *force_device = NULL;
#ifdef WITH_JACK
static void sound_sync_callback(void *data, int mode, float time)
{
// Ugly: Blender doesn't like it when the animation is played back during rendering
if (G.is_rendering)
return;
struct Main *bmain = (struct Main *)data;
struct Scene *scene;
@ -693,6 +697,10 @@ void BKE_sound_seek_scene(struct Main *bmain, struct Scene *scene)
float BKE_sound_sync_scene(struct Scene *scene)
{
// Ugly: Blender doesn't like it when the animation is played back during rendering
if (G.is_rendering)
return NAN_FLT;
if (scene->playback_handle) {
if (scene->audio.flag & AUDIO_SYNC)
return AUD_getSynchronizerPosition(scene->playback_handle);
@ -704,6 +712,10 @@ float BKE_sound_sync_scene(struct Scene *scene)
int BKE_sound_scene_playing(struct Scene *scene)
{
// Ugly: Blender doesn't like it when the animation is played back during rendering
if (G.is_rendering)
return -1;
if (scene->audio.flag & AUDIO_SYNC)
return AUD_isSynchronizerPlaying();
else