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/interface | |
| parent | 50dab4fc37d33352c2f1c6181da9d54799e36a12 (diff) | |
rename and negate DISABLE_PYTHON --> WITH_PYTHON
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | source/blender/editors/interface/SConscript | 4 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt index 31de4537c24..23a96cce3dc 100644 --- a/source/blender/editors/interface/CMakeLists.txt +++ b/source/blender/editors/interface/CMakeLists.txt @@ -56,8 +56,8 @@ IF(WITH_INTERNATIONAL) ADD_DEFINITIONS(-DINTERNATIONAL) ENDIF(WITH_INTERNATIONAL) -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_interface "${SRC}" "${INC}") diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript index 81964a661a4..639a5268ca2 100644 --- a/source/blender/editors/interface/SConscript +++ b/source/blender/editors/interface/SConscript @@ -16,7 +16,7 @@ defs = [] if env['WITH_BF_INTERNATIONAL']: defs.append('INTERNATIONAL') -if not env['WITH_BF_PYTHON']: - defs.append('DISABLE_PYTHON') +if env['WITH_BF_PYTHON']: + defs.append('WITH_PYTHON') env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), defs, libtype=['core'], priority=[110] ) diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index f65b10eaaea..eee4f133043 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -1645,7 +1645,7 @@ int ui_set_but_string(bContext *C, uiBut *but, const char *str) /* number editing */ double value; -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON { char str_unit_convert[256]; int unit_type; @@ -1672,7 +1672,7 @@ int ui_set_but_string(bContext *C, uiBut *but, const char *str) } #else value= atof(str); -#endif +#endif // WITH_PYTHON if(!ui_is_but_float(but)) value= (int)floor(value + 0.5); if(but->type==NUMABS) value= fabs(value); |