sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Building without Python works again

Browse Source
This commit is contained in:
Campbell Barton 2015-05-19 11:34:52 +10:00
parent 65328fadc3
commit 183b643774
5 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenfont/CMakeLists.txt
View File

@ -29,7 +29,6 @@ set(INC
../gpu
../makesdna
../makesrna
../python
../imbuf
../../../intern/guardedalloc
../../../intern/glew-mx
@ -67,7 +66,13 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
if(WITH_PYTHON)
add_definitions(-DWITH_PYTHON)
list(APPEND INC
../python
)
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_blenfont "${SRC}" "${INC}" "${INC_SYS}")

5
source/blender/blenfont/SConscript
View File

@ -44,7 +44,6 @@ incs = [
'../imbuf',
'../makesdna',
'../makesrna',
'../python',
]
incs.extend(Split(env['BF_FREETYPE_INC']))
@ -57,6 +56,10 @@ if sys.platform == 'win32' or env['OURPLATFORM'] == 'linuxcross':
if env['WITH_BF_INTERNATIONAL']:
defs.append('WITH_INTERNATIONAL')
if env['WITH_BF_PYTHON']:
defs.append('WITH_PYTHON')
incs.append('../python')
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
incs.append(env['BF_PTHREADS_INC'])

4
source/blender/blenfont/intern/blf_translation.c
View File

@ -46,7 +46,9 @@
#include "DNA_userdef_types.h" /* For user settings. */
#ifdef WITH_PYTHON
#include "BPY_extern.h"
#endif
#ifdef WITH_INTERNATIONAL
@ -152,9 +154,11 @@ const char *BLF_pgettext(const char *msgctxt, const char *msgid)
/* We assume if the returned string is the same (memory level) as the msgid, no translation was found,
* and we can try py scripts' ones!
*/
#ifdef WITH_PYTHON
if (ret == msgid) {
ret = BPY_app_translations_py_pgettext(msgctxt, msgid);
}
#endif
}
return ret;

2
source/blender/blenkernel/intern/fcurve.c
View File

@ -70,7 +70,9 @@
#define SMALL -1.0e-10
#define SELECT 1
#ifdef WITH_PYTHON
static ThreadMutex python_driver_lock = BLI_MUTEX_INITIALIZER;
#endif
/* ************************** Data-Level Functions ************************* */

4
source/blender/windowmanager/intern/wm_keymap.c
View File

@ -990,10 +990,12 @@ static wmKeyMapItem *wm_keymap_item_find_handlers(
"this might not be desired!\n", opname);
printf("\tkm: '%s', kmi: '%s'\n", keymap->idname, kmi_str);
#ifndef NDEBUG
#ifdef WITH_PYTHON
printf("OPERATOR\n");
IDP_spit(properties);
printf("KEYMAP\n");
IDP_spit(kmi->ptr->data);
#endif
#endif
printf("\n");
}
@ -1137,10 +1139,12 @@ static wmKeyMapItem *wm_keymap_item_find(
"this might not be desired!\n", opname);
printf("\tkm: '%s', kmi: '%s'\n", km->idname, kmi_str);
#ifndef NDEBUG
#ifdef WITH_PYTHON
printf("OPERATOR\n");
IDP_spit(properties);
printf("KEYMAP\n");
IDP_spit(kmi->ptr->data);
#endif
#endif
printf("\n");
}