diff options
| author | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-06-15 12:28:56 +0400 |
|---|---|---|
| committer | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-06-15 12:28:56 +0400 |
| commit | 40981d872f0410caf1870194c8e15ebaed864dea (patch) | |
| tree | adde4556e99bbc684580f028c1d962369d9f2676 /source/blender/editors/space_info | |
| parent | 68c8aecb465bf0c8e229c50958dc004bde7407b3 (diff) | |
| parent | 81946b9138201800e495eb28addf254958feb1a4 (diff) | |
merge from trunk r37405
Diffstat (limited to 'source/blender/editors/space_info')
| -rw-r--r-- | source/blender/editors/space_info/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blender/editors/space_info/info_ops.c | 10 | ||||
| -rw-r--r-- | source/blender/editors/space_info/info_report.c | 1 |
3 files changed, 11 insertions, 5 deletions
diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt index 16f4b2dedff..c6ed1b7bac7 100644 --- a/source/blender/editors/space_info/CMakeLists.txt +++ b/source/blender/editors/space_info/CMakeLists.txt @@ -30,6 +30,9 @@ set(INC ../../makesrna ../../windowmanager ../../../../intern/guardedalloc +) + +set(INC_SYS ${GLEW_INCLUDE_PATH} ) @@ -45,4 +48,4 @@ set(SRC textview.h ) -blender_add_lib(bf_editor_space_info "${SRC}" "${INC}") +blender_add_lib(bf_editor_space_info "${SRC}" "${INC}" "${INC_SYS}") diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c index d58fb7b11f0..0fb17498443 100644 --- a/source/blender/editors/space_info/info_ops.c +++ b/source/blender/editors/space_info/info_ops.c @@ -45,6 +45,8 @@ #include "BLI_bpath.h" #include "BLI_utildefines.h" +#include "BLF_api.h" + #include "BKE_context.h" #include "BKE_global.h" #include "BKE_image.h" @@ -211,7 +213,7 @@ static int make_paths_relative_exec(bContext *C, wmOperator *op) void FILE_OT_make_paths_relative(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make All Paths Relative"; + ot->name= _("Make All Paths Relative"); ot->idname= "FILE_OT_make_paths_relative"; /* api callbacks */ @@ -243,7 +245,7 @@ static int make_paths_absolute_exec(bContext *C, wmOperator *op) void FILE_OT_make_paths_absolute(wmOperatorType *ot) { /* identifiers */ - ot->name= "Make All Paths Absolute"; + ot->name= _("Make All Paths Absolute"); ot->idname= "FILE_OT_make_paths_absolute"; /* api callbacks */ @@ -266,7 +268,7 @@ static int report_missing_files_exec(bContext *UNUSED(C), wmOperator *op) void FILE_OT_report_missing_files(wmOperatorType *ot) { /* identifiers */ - ot->name= "Report Missing Files"; + ot->name= _("Report Missing Files"); ot->idname= "FILE_OT_report_missing_files"; /* api callbacks */ @@ -299,7 +301,7 @@ static int find_missing_files_invoke(bContext *C, wmOperator *op, wmEvent *UNUSE void FILE_OT_find_missing_files(wmOperatorType *ot) { /* identifiers */ - ot->name= "Find Missing Files"; + ot->name= _("Find Missing Files"); ot->idname= "FILE_OT_find_missing_files"; /* api callbacks */ diff --git a/source/blender/editors/space_info/info_report.c b/source/blender/editors/space_info/info_report.c index 937b683e880..c8bda434227 100644 --- a/source/blender/editors/space_info/info_report.c +++ b/source/blender/editors/space_info/info_report.c @@ -302,6 +302,7 @@ void INFO_OT_select_border(wmOperatorType *ot) ot->invoke= WM_border_select_invoke; ot->exec= borderselect_exec; ot->modal= WM_border_select_modal; + ot->cancel= WM_border_select_cancel; ot->poll= ED_operator_info_active; |