merged from trunk 20741:20848

* Missing changes to release/windows/installer
* Sequencer fixes in source/blender/src/seqaudio.c dont apply to 2.5
* brechts fix for #18855 r20763 wasnt merged, does this apply to 2.5?

tools/btools.py

@@ -65,6 +65,7 @@ def validate_arguments(args, bc):
 			'WITH_BF_LCMS', 'BF_LCMS_LIB',
 			'WITH_BF_DOCS',
 			'BF_NUMJOBS',
+			'BF_MSVS',
 			]
 	
 	# Have options here that scons expects to be lists
@@ -363,7 +364,8 @@ def read_opts(cfg, args):
 		(BoolVariable('WITH_BF_DOCS', 'Generate API documentation', False)),
 		
 		('BF_CONFIG', 'SCons python config file used to set default options', 'user_config.py'),
-		('BF_NUMJOBS', 'Number of build processes to spawn', '1')
+		('BF_NUMJOBS', 'Number of build processes to spawn', '1'),
+		('BF_MSVS', 'Generate MSVS project files and solution', False)
 
 	) # end of opts.AddOptions()
 
@@ -403,9 +405,13 @@ def NSIS_Installer(target=None, source=None, env=None):
 
 	ns = open("00.sconsblender.nsi","r")
 
+
 	ns_cnt = str(ns.read())
 	ns.close()
 
+	# set Python version we compile against
+	ns_cnt = string.replace(ns_cnt, "[PYTHON_VERSION]", env['BF_PYTHON_VERSION'])
+
 	# do root
 	rootlist = []
 	rootdir = os.listdir(inst_dir+"\\")