[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25857] trunk/blender: Removed game_sound property as it is not working and not necessary anymore .

Joerg Mueller nexyon at gmail.com
Sat Jan 9 23:28:05 CET 2010


Revision: 25857
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25857
Author:   nexyon
Date:     2010-01-09 23:28:05 +0100 (Sat, 09 Jan 2010)

Log Message:
-----------
Removed game_sound property as it is not working and not necessary anymore.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_userpref.py
    trunk/blender/source/blender/editors/space_view3d/view3d_view.c
    trunk/blender/source/blender/makesdna/DNA_userdef_types.h
    trunk/blender/source/blender/makesrna/intern/rna_userdef.c

Modified: trunk/blender/release/scripts/ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref.py	2010-01-09 20:42:35 UTC (rev 25856)
+++ trunk/blender/release/scripts/ui/space_userpref.py	2010-01-09 22:28:05 UTC (rev 25857)
@@ -408,7 +408,6 @@
         sub = col.column()
         sub.active = system.audio_device != 'NONE'
         #sub.prop(system, "enable_all_codecs")
-        sub.prop(system, "game_sound")
         sub.prop(system, "audio_channels", text="Channels")
         sub.prop(system, "audio_mixing_buffer", text="Mixing Buffer")
         sub.prop(system, "audio_sample_rate", text="Sample Rate")

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c	2010-01-09 20:42:35 UTC (rev 25856)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c	2010-01-09 22:28:05 UTC (rev 25857)
@@ -1656,11 +1656,6 @@
 
 	if ( (syshandle = SYS_GetSystem()) ) {
 		/* User defined settings */
-		test= (U.gameflags & USER_DISABLE_SOUND);
-		/* if user already disabled audio at the command-line, don't re-enable it */
-		if (test)
-			SYS_WriteCommandLineInt(syshandle, "noaudio", test);
-
 		test= (U.gameflags & USER_DISABLE_MIPMAP);
 		GPU_set_mipmap(!test);
 		SYS_WriteCommandLineInt(syshandle, "nomipmap", test);

Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2010-01-09 20:42:35 UTC (rev 25856)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2010-01-09 22:28:05 UTC (rev 25857)
@@ -467,7 +467,8 @@
 
 /* gameflags */
 #define USER_DEPRECATED_FLAG	1
-#define USER_DISABLE_SOUND		2
+// #define USER_DISABLE_SOUND		2 deprecated, don't use without checking for
+// backwards compatibilty in do_versions!
 #define USER_DISABLE_MIPMAP		4
 #define USER_DISABLE_VBO		8
 #define USER_DISABLE_AA			16

Modified: trunk/blender/source/blender/makesrna/intern/rna_userdef.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2010-01-09 20:42:35 UTC (rev 25856)
+++ trunk/blender/source/blender/makesrna/intern/rna_userdef.c	2010-01-09 22:28:05 UTC (rev 25857)
@@ -2204,10 +2204,6 @@
 	RNA_def_property_range(prop, 0, 32727);
 	RNA_def_property_ui_text(prop, "Frame Server Port", "Frameserver Port for Framserver-Rendering.");
 
-	prop= RNA_def_property(srna, "game_sound", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "gameflags", USER_DISABLE_SOUND);
-	RNA_def_property_ui_text(prop, "Game Sound", "Enables sounds to be played in games.");
-
 	prop= RNA_def_property(srna, "clip_alpha", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "glalphaclip");
 	RNA_def_property_range(prop, 0.0f, 1.0f);





More information about the Bf-blender-cvs mailing list