diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-10-31 07:11:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-10-31 07:11:39 +0300 |
| commit | 0876fce0094ad3e37be4b197ef8850757eacd37b (patch) | |
| tree | bdcd409899a59f1d0239b14d0ec79a7e5f531a06 /source/blender/editors/space_console | |
| parent | 50dab4fc37d33352c2f1c6181da9d54799e36a12 (diff) | |
rename and negate DISABLE_PYTHON --> WITH_PYTHON
Diffstat (limited to 'source/blender/editors/space_console')
| -rw-r--r-- | source/blender/editors/space_console/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_console/SConscript | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_console/space_console.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt index b1d9920fed4..dbef838db65 100644 --- a/source/blender/editors/space_console/CMakeLists.txt +++ b/source/blender/editors/space_console/CMakeLists.txt @@ -38,8 +38,8 @@ SET(SRC space_console.c ) -IF(NOT WITH_PYTHON) - ADD_DEFINITIONS(-DDISABLE_PYTHON) -ENDIF(NOT WITH_PYTHON) +IF(WITH_PYTHON) + ADD_DEFINITIONS(-DWITH_PYTHON) +ENDIF(WITH_PYTHON) BLENDERLIB(bf_editor_space_console "${SRC}" "${INC}") diff --git a/source/blender/editors/space_console/SConscript b/source/blender/editors/space_console/SConscript index 087090a7740..f246f08d7ac 100644 --- a/source/blender/editors/space_console/SConscript +++ b/source/blender/editors/space_console/SConscript @@ -17,7 +17,7 @@ incs = [ '../../blenloader', ] -if not env['WITH_BF_PYTHON']: - defs.append('DISABLE_PYTHON') +if env['WITH_BF_PYTHON']: + defs.append('WITH_PYTHON') env.BlenderLib ( 'bf_editors_space_console', sources, incs, defs, libtype=['core'], priority=[95] ) diff --git a/source/blender/editors/space_console/space_console.c b/source/blender/editors/space_console/space_console.c index 70263788b13..72478133f1c 100644 --- a/source/blender/editors/space_console/space_console.c +++ b/source/blender/editors/space_console/space_console.c @@ -327,7 +327,7 @@ void console_keymap(struct wmKeyConfig *keyconf) RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_delete", DELKEY, KM_PRESS, 0, 0)->ptr, "type", DEL_NEXT_CHAR); RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_delete", BACKSPACEKEY, KM_PRESS, 0, 0)->ptr, "type", DEL_PREV_CHAR); -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON WM_keymap_add_item(keymap, "CONSOLE_OT_execute", RETKEY, KM_PRESS, 0, 0); /* python operator - space_text.py */ WM_keymap_add_item(keymap, "CONSOLE_OT_execute", PADENTER, KM_PRESS, 0, 0); |