Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

flipping "tab as space" option (so it's on by default - argh ;)

Browse Source 
(and fix error in creator.c last commit)
This commit is contained in:
Dalai Felinto
2010-03-06 22:12:42 +00:00
parent 3838b80cf1
commit 26fae8985b
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenkernel/intern/text.c
View File

@@ -191,7 +191,7 @@ Text *add_empty_text(char *name)
ta->nlines=1; ta->nlines=1;
ta->flags= TXT_ISDIRTY | TXT_ISMEM; ta->flags= TXT_ISDIRTY | TXT_ISMEM;
if(U.flag & USER_TXT_TABSTOSPACES) if((U.flag & USER_TXT_TABSTOSPACES_DISABLE)==0)
ta->flags |= TXT_TABSTOSPACES; ta->flags |= TXT_TABSTOSPACES;
ta->lines.first= ta->lines.last= NULL; ta->lines.first= ta->lines.last= NULL;
@@ -357,7 +357,7 @@ Text *add_text(char *file, const char *relpath)
ta->markers.first= ta->markers.last= NULL; ta->markers.first= ta->markers.last= NULL;
ta->curl= ta->sell= NULL; ta->curl= ta->sell= NULL;
if(U.flag & USER_TXT_TABSTOSPACES) if((U.flag & USER_TXT_TABSTOSPACES_DISABLE)==0)
ta->flags= TXT_TABSTOSPACES; ta->flags= TXT_TABSTOSPACES;
fseek(fp, 0L, SEEK_END); fseek(fp, 0L, SEEK_END);

2
source/blender/makesdna/DNA_userdef_types.h
View File

@@ -406,7 +406,7 @@ extern UserDef U; /* from blenkernel blender.c */
#define USER_SCRIPT_AUTOEXEC_DISABLE (1 << 22) #define USER_SCRIPT_AUTOEXEC_DISABLE (1 << 22)
#define USER_FILENOUI (1 << 23) #define USER_FILENOUI (1 << 23)
#define USER_NONEGFRAMES (1 << 24) #define USER_NONEGFRAMES (1 << 24)
#define USER_TXT_TABSTOSPACES (1 << 25) #define USER_TXT_TABSTOSPACES_DISABLE (1 << 25)
/* helper macro for checking frame clamping */ /* helper macro for checking frame clamping */
#define FRAMENUMBER_MIN_CLAMP(cfra) \ #define FRAMENUMBER_MIN_CLAMP(cfra) \

4
source/blender/makesrna/intern/rna_userdef.c
View File

@@ -2359,8 +2359,8 @@ static void rna_def_userdef_system(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update"); RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update");
prop= RNA_def_property(srna, "tabs_as_spaces", PROP_BOOLEAN, PROP_NONE); prop= RNA_def_property(srna, "tabs_as_spaces", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_TXT_TABSTOSPACES); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TXT_TABSTOSPACES_DISABLE);
RNA_def_property_ui_text(prop, "Tabs as Spaces", "Automatically converts all new tabs into spaces in Text Editor"); RNA_def_property_ui_text(prop, "Tabs as Spaces", "Automatically converts all new tabs into spaces for new and loaded text files");
prop= RNA_def_property(srna, "prefetch_frames", PROP_INT, PROP_NONE); prop= RNA_def_property(srna, "prefetch_frames", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "prefetchframes"); RNA_def_property_int_sdna(prop, NULL, "prefetchframes");

3
source/creator/creator.c
View File

@@ -1038,9 +1038,8 @@ int main(int argc, char **argv)
} }
else { else {
if((G.fileflags & (G_FILE_AUTOPLAY | G_SCRIPT_AUTOEXEC)){ if((G.fileflags & G_FILE_AUTOPLAY) && (G.fileflags & G_SCRIPT_AUTOEXEC))
WM_init_game(C); WM_init_game(C);
}
else if(!G.file_loaded) else if(!G.file_loaded)
WM_init_splash(C); WM_init_splash(C);