[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30370] trunk/blender: change some references to .B.blend, .Blog to new names
Campbell Barton
ideasman42 at gmail.com
Thu Jul 15 13:51:43 CEST 2010
Revision: 30370
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30370
Author: campbellbarton
Date: 2010-07-15 13:51:43 +0200 (Thu, 15 Jul 2010)
Log Message:
-----------
change some references to .B.blend, .Blog to new names
Modified Paths:
--------------
trunk/blender/release/scripts/modules/rna_info.py
trunk/blender/source/blender/blenlib/intern/path_util.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/editors/interface/interface_style.c
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/python/doc/sphinx_doc_gen.py
trunk/blender/source/blender/python/generic/bgl.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
trunk/blender/source/creator/creator.c
trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp
Modified: trunk/blender/release/scripts/modules/rna_info.py
===================================================================
--- trunk/blender/release/scripts/modules/rna_info.py 2010-07-15 11:40:31 UTC (rev 30369)
+++ trunk/blender/release/scripts/modules/rna_info.py 2010-07-15 11:51:43 UTC (rev 30370)
@@ -631,8 +631,8 @@
props = [(prop.identifier, prop) for prop in v.properties]
for prop_id, prop in sorted(props):
- if prop.type == 'boolean':
- continue
+ # if prop.type == 'boolean':
+ # continue
data += "%s.%s -> %s: %s%s %s\n" % (struct_id_str, prop.identifier, prop.identifier, prop.type, ", (read-only)" if prop.is_readonly else "", prop.description)
if bpy.app.background:
Modified: trunk/blender/source/blender/blenlib/intern/path_util.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/path_util.c 2010-07-15 11:40:31 UTC (rev 30369)
+++ trunk/blender/source/blender/blenlib/intern/path_util.c 2010-07-15 11:51:43 UTC (rev 30370)
@@ -364,7 +364,7 @@
if (strlen(relfile) > 2 && relfile[1] != ':') {
char* ptemp;
/* fix missing volume name in relative base,
- can happen with old .Blog files */
+ can happen with old recent-files.txt files */
get_default_root(temp);
ptemp = &temp[2];
if (relfile[0] != '\\' && relfile[0] != '/') {
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2010-07-15 11:40:31 UTC (rev 30369)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2010-07-15 11:51:43 UTC (rev 30370)
@@ -174,7 +174,7 @@
- read associated 'direct data'
- link direct data (internal and to LibBlock)
- read FileGlobal
-- read USER data, only when indicated (file is ~/.B.blend or .B25.blend)
+- read USER data, only when indicated (file is ~/X.XX/startup.blend)
- free file
- per Library (per Main)
- read file
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2010-07-15 11:40:31 UTC (rev 30369)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2010-07-15 11:51:43 UTC (rev 30370)
@@ -65,7 +65,7 @@
- write TEST (128x128, blend file preview, optional)
- write FileGlobal (some global vars)
- write SDNA
-- write USER if filename is ~/.B.blend
+- write USER if filename is ~/X.XX/config/startup.blend
*/
Modified: trunk/blender/source/blender/editors/interface/interface_style.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_style.c 2010-07-15 11:40:31 UTC (rev 30369)
+++ trunk/blender/source/blender/editors/interface/interface_style.c 2010-07-15 11:51:43 UTC (rev 30370)
@@ -264,7 +264,7 @@
/* ************** init exit ************************ */
-/* called on each .B.blend read */
+/* called on each startup.blend read */
/* reading without uifont will create one */
void uiStyleInit(void)
{
Modified: trunk/blender/source/blender/editors/interface/resources.c
===================================================================
--- trunk/blender/source/blender/editors/interface/resources.c 2010-07-15 11:40:31 UTC (rev 30369)
+++ trunk/blender/source/blender/editors/interface/resources.c 2010-07-15 11:51:43 UTC (rev 30370)
@@ -999,7 +999,7 @@
}
if (U.savetime <= 0) {
U.savetime = 1;
-// XXX error(".B.blend is buggy, please consider removing it.\n");
+// XXX error("startup.blend is buggy, please consider removing it.\n");
}
/* transform widget settings */
if(U.tw_hotspot==0) {
@@ -1138,7 +1138,7 @@
}
/* set defaults for 3D View rotating axis indicator */
- /* since size can't be set to 0, this indicates it's not saved in .B.blend */
+ /* since size can't be set to 0, this indicates it's not saved in startup.blend */
if (U.rvisize == 0) {
U.rvisize = 15;
U.rvibright = 8;
Modified: trunk/blender/source/blender/python/doc/sphinx_doc_gen.py
===================================================================
--- trunk/blender/source/blender/python/doc/sphinx_doc_gen.py 2010-07-15 11:40:31 UTC (rev 30369)
+++ trunk/blender/source/blender/python/doc/sphinx_doc_gen.py 2010-07-15 11:51:43 UTC (rev 30370)
@@ -553,10 +553,9 @@
fw(" %s\n\n" % struct.description)
# properties sorted in alphabetical order
- zip_props_ids = zip(struct.properties, [prop.identifier for prop in struct.properties])
- zip_props_ids = sorted(zip_props_ids, key=lambda p: p[1])
- sorted_struct_properties = [x[0] for x in zip_props_ids]
-
+ sorted_struct_properties = struct.properties[:]
+ sorted_struct_properties.sort(key=lambda prop: prop.identifier)
+
for prop in sorted_struct_properties:
type_descr = prop.get_type_description(class_fmt=":class:`%s`")
# readonly properties use "data" directive, variables properties use "attribute" directive
Modified: trunk/blender/source/blender/python/generic/bgl.c
===================================================================
--- trunk/blender/source/blender/python/generic/bgl.c 2010-07-15 11:40:31 UTC (rev 30369)
+++ trunk/blender/source/blender/python/generic/bgl.c 2010-07-15 11:51:43 UTC (rev 30370)
@@ -27,9 +27,8 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/* This file is the Blender.BGL part of opy_draw.c, from the old
- * bpython/intern dir, with minor changes to adapt it to the new Python
- * implementation. The BGL submodule "wraps" OpenGL functions and constants,
+/* This file is the 'bgl' module.
+ * The BGL submodule "wraps" OpenGL functions and constants,
* allowing script writers to make OpenGL calls in their Python scripts. */
#include "bgl.h" /*This must come first */
Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c 2010-07-15 11:40:31 UTC (rev 30369)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c 2010-07-15 11:51:43 UTC (rev 30370)
@@ -382,7 +382,7 @@
/* XXX */
G.save_over = 0; // start with save preference untitled.blend
- G.fileflags &= ~G_FILE_AUTOPLAY; /* disable autoplay in .B.blend... */
+ G.fileflags &= ~G_FILE_AUTOPLAY; /* disable autoplay in startup.blend... */
// mainwindow_set_filename_to_title(""); // empty string re-initializes title to "Blender"
// refresh_interface_font();
@@ -418,7 +418,7 @@
G.recent_files.first = G.recent_files.last = NULL;
- /* read list of recent opend files from .Blog to memory */
+ /* read list of recent opend files from recent-files.txt to memory */
for (l= lines, num= 0; l && (num<U.recent_files); l= l->next) {
line = l->link;
if (line[0] && BLI_exists(line)) {
@@ -452,7 +452,7 @@
BLI_make_file_string("/", name, BLI_get_folder_create(BLENDER_USER_CONFIG, NULL), BLENDER_HISTORY_FILE);
recent = G.recent_files.first;
- /* refresh .Blog of recent opened files, when current file was changed */
+ /* refresh recent-files.txt of recent opened files, when current file was changed */
if(!(recent) || (strcmp(recent->filepath, G.sce)!=0)) {
fp= fopen(name, "w");
if (fp) {
@@ -462,11 +462,11 @@
recent->filepath[0] = '\0';
strcpy(recent->filepath, G.sce);
BLI_addhead(&(G.recent_files), recent);
- /* write current file to .Blog */
+ /* write current file to recent-files.txt */
fprintf(fp, "%s\n", recent->filepath);
recent = recent->next;
i=1;
- /* write rest of recent opened files to .Blog */
+ /* write rest of recent opened files to recent-files.txt */
while((i<U.recent_files) && (recent)){
/* this prevents to have duplicities in list */
if (strcmp(recent->filepath, G.sce)!=0) {
Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c 2010-07-15 11:40:31 UTC (rev 30369)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c 2010-07-15 11:51:43 UTC (rev 30370)
@@ -258,7 +258,7 @@
}
else {
- /* this is set to 1 if you don't have .B.blend open */
+ /* this is set to 1 if you don't have startup.blend open */
if(G.save_over) {
char *str= MEM_mallocN(strlen(G.sce) + 16, "title");
Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c 2010-07-15 11:40:31 UTC (rev 30369)
+++ trunk/blender/source/creator/creator.c 2010-07-15 11:51:43 UTC (rev 30370)
@@ -289,7 +289,7 @@
printf ("\t\t\"blender --background test.blend --render-output /tmp --render-frame 1\" works as expected.\n\n");
printf ("\nEnvironment Variables:\n");
- printf (" $HOME\t\t\tStore files such as .blender/ .B.blend .Bfs .Blog here.\n");
+ printf (" $HOME\t\t\tStore '.blender/' containing defaults, bookmarks and user scripts.\n");
printf (" $BLENDERPATH System directory to use for data files and scripts.\n");
printf (" For this build of blender the default $BLENDERPATH is...\n");
printf (" \"%s\"\n", blender_path);
@@ -1101,7 +1101,7 @@
WM_init(C, argc, argv);
/* this is properly initialized with user defs, but this is default */
- BLI_where_is_temp( btempdir, 1 ); /* call after loading the .B.blend so we can read U.tempdir */
+ BLI_where_is_temp( btempdir, 1 ); /* call after loading the startup.blend so we can read U.tempdir */
#ifndef DISABLE_SDL
BLI_setenv("SDL_VIDEODRIVER", "dummy");
@@ -1119,7 +1119,7 @@
WM_init(C, argc, argv);
- BLI_where_is_temp( btempdir, 0 ); /* call after loading the .B.blend so we can read U.tempdir */
+ BLI_where_is_temp( btempdir, 0 ); /* call after loading the startup.blend so we can read U.tempdir */
}
#ifndef DISABLE_PYTHON
/**
Modified: trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp 2010-07-15 11:40:31 UTC (rev 30369)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list