[Bf-blender-cvs] [62a973d] blender-v2.76a-release: BGE: Fix T46556: check on null sound datablock pointer.
Porteries Tristan
noreply at git.blender.org
Thu Oct 29 11:40:11 CET 2015
Commit: 62a973db317af202dff47f2702e6a2f53b8efb2a
Author: Porteries Tristan
Date: Thu Oct 22 20:06:29 2015 +0200
Branches: blender-v2.76a-release
https://developer.blender.org/rB62a973db317af202dff47f2702e6a2f53b8efb2a
BGE: Fix T46556: check on null sound datablock pointer.
===================================================================
M source/gameengine/Converter/KX_ConvertActuators.cpp
===================================================================
diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp
index 3b36e09..7b62f07 100644
--- a/source/gameengine/Converter/KX_ConvertActuators.cpp
+++ b/source/gameengine/Converter/KX_ConvertActuators.cpp
@@ -421,7 +421,7 @@ void BL_ConvertActuators(const char* maggiename,
soundActuatorType);
// if we made it mono, we have to free it
- if(snd_sound != sound->playback_handle && snd_sound != NULL)
+ if(sound && snd_sound && snd_sound != sound->playback_handle)
AUD_Sound_free(snd_sound);
tmpsoundact->SetName(bact->name);
More information about the Bf-blender-cvs
mailing list