sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

change some references to .B.blend, .Blog to new names

Browse Source
This commit is contained in:
Campbell Barton 2010-07-15 11:51:43 +00:00
parent dcc1e6019d
commit 5daf9354d2
12 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/modules/rna_info.py
View File

@ -631,8 +631,8 @@ if __name__ == "__main__":
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:

2
source/blender/blenlib/intern/path_util.c
View File

@ -364,7 +364,7 @@ void BLI_path_rel(char *file, const char *relfile)
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] != '/') {

2
source/blender/blenloader/intern/readfile.c
View File

@ -174,7 +174,7 @@ READ
- 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

2
source/blender/blenloader/intern/writefile.c
View File

@ -65,7 +65,7 @@ Any case: direct data is ALWAYS after the lib block
- 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
*/

2
source/blender/editors/interface/interface_style.c
View File

@ -264,7 +264,7 @@ void UI_DrawString(float x, float y, char *str)
/* ************** init exit ************************ */
/* called on each .B.blend read */
/* called on each startup.blend read */
/* reading without uifont will create one */
void uiStyleInit(void)
{

4
source/blender/editors/interface/resources.c
View File

@ -999,7 +999,7 @@ void init_userdef_do_versions(void)
}
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 @@ void init_userdef_do_versions(void)
}
/* 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;

7
source/blender/python/doc/sphinx_doc_gen.py
View File

@ -553,10 +553,9 @@ def rna2sphinx(BASEPATH):
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

5
source/blender/python/generic/bgl.c
View File

@ -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 */

10
source/blender/windowmanager/intern/wm_files.c
View File

@ -382,7 +382,7 @@ int WM_read_homefile(bContext *C, wmOperator *op)
/* 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 @@ void read_history(void)
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 @@ static void write_history(void)
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 @@ static void write_history(void)
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) {

2
source/blender/windowmanager/intern/wm_window.c
View File

@ -258,7 +258,7 @@ void wm_window_title(wmWindowManager *wm, wmWindow *win)
}
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");

6
source/creator/creator.c
View File

@ -289,7 +289,7 @@ static int print_help(int argc, char **argv, void *data)
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 @@ int main(int argc, char **argv)
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 @@ int main(int argc, char **argv)
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
/**

2
source/gameengine/Ketsji/KX_Camera.cpp
View File

@ -740,7 +740,7 @@ int KX_Camera::pyattr_set_ortho_scale(void *self_v, const KX_PYATTRIBUTE_DEF *at
KX_Camera* self= static_cast<KX_Camera*>(self_v);
float param = PyFloat_AsDouble(value);
if (param == -1) {
PyErr_SetString(PyExc_AttributeError, "camera.scale = float: KX_Camera, expected a float greater then zero");
PyErr_SetString(PyExc_AttributeError, "camera.ortho_scale = float: KX_Camera, expected a float greater then zero");
return PY_SET_ATTR_FAIL;
}