[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27299] trunk/blender/source: flipping " tab as space" option (so it's on by default - argh ; )

[Dalai Felinto]

Revision: 27299
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27299
Author:   dfelinto
Date:     2010-03-06 23:12:42 +0100 (Sat, 06 Mar 2010)

Log Message:
-----------
flipping "tab as space" option (so it's on by default - argh ;)
(and fix error in creator.c last commit)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/text.c
    trunk/blender/source/blender/makesdna/DNA_userdef_types.h
    trunk/blender/source/blender/makesrna/intern/rna_userdef.c
    trunk/blender/source/creator/creator.c

Modified: trunk/blender/source/blender/blenkernel/intern/text.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/text.c	2010-03-06 21:47:16 UTC (rev 27298)
+++ trunk/blender/source/blender/blenkernel/intern/text.c	2010-03-06 22:12:42 UTC (rev 27299)
@@ -191,7 +191,7 @@
 
 	ta->nlines=1;
 	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->lines.first= ta->lines.last= NULL;
@@ -357,7 +357,7 @@
 	ta->markers.first= ta->markers.last= NULL;
 	ta->curl= ta->sell= NULL;
 
-	if(U.flag & USER_TXT_TABSTOSPACES)
+	if((U.flag & USER_TXT_TABSTOSPACES_DISABLE)==0)
 		ta->flags= TXT_TABSTOSPACES;
 
 	fseek(fp, 0L, SEEK_END);

Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2010-03-06 21:47:16 UTC (rev 27298)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2010-03-06 22:12:42 UTC (rev 27299)
@@ -406,7 +406,7 @@
 #define USER_SCRIPT_AUTOEXEC_DISABLE	(1 << 22)
 #define USER_FILENOUI			(1 << 23)
 #define USER_NONEGFRAMES		(1 << 24)
-#define USER_TXT_TABSTOSPACES	(1 << 25)
+#define USER_TXT_TABSTOSPACES_DISABLE	(1 << 25)
 
 /* helper macro for checking frame clamping */
 #define FRAMENUMBER_MIN_CLAMP(cfra) \

Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2010-03-06 21:47:16 UTC (rev 27298)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2010-03-06 22:12:42 UTC (rev 27299)
@@ -2359,8 +2359,8 @@
 	RNA_def_property_update(prop, 0, "rna_userdef_script_autoexec_update");
 
 	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_ui_text(prop, "Tabs as Spaces", "Automatically converts all new tabs into spaces in Text Editor");
+	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 for new and loaded text files");
 
 	prop= RNA_def_property(srna, "prefetch_frames", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "prefetchframes");

Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c	2010-03-06 21:47:16 UTC (rev 27298)
+++ trunk/blender/source/creator/creator.c	2010-03-06 22:12:42 UTC (rev 27299)
@@ -1038,9 +1038,8 @@
 	}
 
 	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);
-		}
 
 		else if(!G.file_loaded)
 			WM_init_splash(C);