merge from trunk r37405

This commit is contained in:
Xiao Xiangquan
2011-06-15 08:28:56 +00:00
369 changed files with 7447 additions and 2867 deletions

View File

@@ -71,6 +71,7 @@ extern "C"
#include "BLO_runtime.h"
#include "IMB_imbuf.h"
#include "BKE_text.h"
#include "BKE_sound.h"
int GHOST_HACK_getFirstFile(char buf[]);
@@ -453,6 +454,8 @@ int main(int argc, char** argv)
U.audioformat = 0x24;
U.audiochannels = 2;
sound_init_once();
/* if running blenderplayer the last argument can't be parsed since it has to be the filename. */
isBlenderPlayer = !BLO_is_a_runtime(argv[0]);
if (isBlenderPlayer)