Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merged changes in the trunk up to revision 55546.

Browse Source 
Conflicts resolved:
source/blenderplayer/bad_level_call_stubs/SConscript

Partly reverted changes to intern/cycles/blender/addon/ui.py in revision 52899
to make it easier to merge trunk changes.
This commit is contained in:
Tamito Kajiyama
2013-03-24 12:13:13 +00:00
parent 5841d1c814 b5ce1b1a23
commit 385c72f5f2
379 changed files with 6689 additions and 5533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/creator/CMakeLists.txt
View File

@@ -486,7 +486,7 @@ elseif(WIN32)
if(WITH_PYTHON)
set_lib_path(PYLIB "python")
STRING(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
install(
FILES ${PYLIB}/lib/python${_PYTHON_VERSION_NO_DOTS}.dll

7
source/creator/creator.c
View File

@@ -84,6 +84,7 @@
#include "BLI_blenlib.h"
#include "BKE_blender.h"
#include "BKE_brush.h"
#include "BKE_context.h"
#include "BKE_depsgraph.h" /* for DAG_on_visible_update */
#include "BKE_font.h"
@@ -675,10 +676,10 @@ static int without_borders(int UNUSED(argc), const char **UNUSED(argv), void *UN
return 0;
}
extern int wm_start_with_console; /* wm_init_exit.c */
extern bool wm_start_with_console; /* wm_init_exit.c */
static int start_with_console(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(data))
{
wm_start_with_console = 1;
wm_start_with_console = true;
return 0;
}
@@ -1495,6 +1496,8 @@ int main(int argc, const char **argv)
IMB_init();
BKE_images_init();
BKE_brush_system_init();
#ifdef WITH_FFMPEG
IMB_ffmpeg_init();
#endif