Revision: 41022
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41022
Author: campbellbarton
Date: 2011-10-15 05:01:47 +0000 (Sat, 15 Oct 2011)
Log Message:
-----------
misc edits
- cmake/windows was installing locale & font when internationalization was
disabled, twice when enabled.
- file selector was using the string size-1, where this isn't needed since
string buttons expected this value to be the sizeof(), accounting for '\0'.
- use const char for extension checking funcs.
- minor pep8 edits
Modified Paths:
--------------
trunk/blender/po/update_msg.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/source/blender/blenloader/BLO_readfile.h
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/editors/include/ED_fileselect.h
trunk/blender/source/blender/editors/space_file/file_draw.c
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/po/update_msg.py
===================================================================
--- trunk/blender/po/update_msg.py 2011-10-15 03:56:05 UTC (rev 41021)
+++ trunk/blender/po/update_msg.py 2011-10-15 05:01:47 UTC (rev 41022)
@@ -135,10 +135,12 @@
item.identifier,
)
# Here identifier and name can be the same!
- if item.name: # and item.name != item.identifier:
- messages.setdefault(item.name, []).append(msgsrc)
+ if item.name: # and item.name != item.identifier:
+ messages.setdefault(item.name,
+ []).append(msgsrc)
if item.description:
- messages.setdefault(item.description,
[]).append(msgsrc)
+ messages.setdefault(item.description,
+ []).append(msgsrc)
def walkRNA(bl_rna):
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-10-15
03:56:05 UTC (rev 41021)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-10-15
05:01:47 UTC (rev 41022)
@@ -985,6 +985,7 @@
layout.operator("object.join_uvs") # stupid place to add this!
+
class VIEW3D_MT_object_game(Menu):
bl_label = "Game"
Modified: trunk/blender/source/blender/blenloader/BLO_readfile.h
===================================================================
--- trunk/blender/source/blender/blenloader/BLO_readfile.h 2011-10-15
03:56:05 UTC (rev 41021)
+++ trunk/blender/source/blender/blenloader/BLO_readfile.h 2011-10-15
05:01:47 UTC (rev 41022)
@@ -204,7 +204,7 @@
#define GROUP_MAX 32
-int BLO_has_bfile_extension(char *str);
+int BLO_has_bfile_extension(const char *str);
/* return ok when a blenderfile, in dir is the filename,
* in group the type of libdata
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2011-10-15
03:56:05 UTC (rev 41021)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-10-15
05:01:47 UTC (rev 41022)
@@ -1048,7 +1048,7 @@
/* ************ DIV ****************** */
-int BLO_has_bfile_extension(char *str)
+int BLO_has_bfile_extension(const char *str)
{
return (BLI_testextensie(str, ".ble") || BLI_testextensie(str,
".blend") || BLI_testextensie(str, ".blend.gz"));
}
Modified: trunk/blender/source/blender/editors/include/ED_fileselect.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_fileselect.h
2011-10-15 03:56:05 UTC (rev 41021)
+++ trunk/blender/source/blender/editors/include/ED_fileselect.h
2011-10-15 05:01:47 UTC (rev 41022)
@@ -106,7 +106,7 @@
void ED_fileselect_exit(struct bContext *C, struct SpaceFile *sfile);
-int ED_file_extension_icon(char *relname);
+int ED_file_extension_icon(const char *relname);
#endif /* ED_FILES_H */
Modified: trunk/blender/source/blender/editors/space_file/file_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_draw.c 2011-10-15
03:56:05 UTC (rev 41021)
+++ trunk/blender/source/blender/editors/space_file/file_draw.c 2011-10-15
05:01:47 UTC (rev 41022)
@@ -181,7 +181,7 @@
but = uiDefButTextO(block, TEX, "FILE_OT_directory", 0, "",
min_x, line1_y, line1_w-chan_offs, btn_h,
- params->dir, 0.0, (float)FILE_MAX-1, 0, 0,
+ params->dir, 0.0, (float)FILE_MAX, 0, 0,
UI_translate_do_tooltip(N_("File path")));
uiButSetCompleteFunc(but, autocomplete_directory, NULL);
uiButSetFlag(but, UI_BUT_NO_UTF8);
@@ -189,7 +189,7 @@
if((params->flag & FILE_DIRSEL_ONLY) == 0) {
but = uiDefBut(block, TEX, B_FS_FILENAME, "",
min_x, line2_y, line2_w-chan_offs,
btn_h,
- params->file, 0.0,
(float)FILE_MAXFILE-1, 0, 0,
+ params->file, 0.0,
(float)FILE_MAXFILE, 0, 0,
UI_translate_do_tooltip(overwrite_alert ?N_("File name, overwrite existing") :
N_("File name")));
uiButSetCompleteFunc(but, autocomplete_file, NULL);
uiButSetFlag(but, UI_BUT_NO_UTF8);
Modified: trunk/blender/source/blender/editors/space_file/filelist.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/filelist.c 2011-10-15
03:56:05 UTC (rev 41021)
+++ trunk/blender/source/blender/editors/space_file/filelist.c 2011-10-15
05:01:47 UTC (rev 41022)
@@ -736,7 +736,7 @@
}
-static int file_extension_type(char *relname)
+static int file_extension_type(const char *relname)
{
if(BLO_has_bfile_extension(relname)) {
return BLENDERFILE;
@@ -769,7 +769,7 @@
return 0;
}
-int ED_file_extension_icon(char *relname)
+int ED_file_extension_icon(const char *relname)
{
int type= file_extension_type(relname);
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2011-10-15 03:56:05 UTC (rev
41021)
+++ trunk/blender/source/creator/CMakeLists.txt 2011-10-15 05:01:47 UTC (rev
41022)
@@ -443,14 +443,6 @@
endif()
endif()
- install( # same as linux!, deduplicate
- DIRECTORY
- ${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
- ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
- DESTINATION ${TARGETDIR_VER}/datafiles
- PATTERN ".svn" EXCLUDE
- )
-
# plugins in blender 2.5 don't work at the moment.
#
# install(
@@ -656,8 +648,8 @@
if(WITH_INTERNATIONAL)
install(
DIRECTORY
- ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
${CMAKE_SOURCE_DIR}/release/bin/.blender/locale
+ ${CMAKE_SOURCE_DIR}/release/bin/.blender/fonts
DESTINATION ${TARGETDIR_VER}/datafiles
PATTERN ".svn" EXCLUDE
)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
