[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17443] branches/projection-paint: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17405 :HEAD

Campbell Barton ideasman42 at gmail.com
Thu Nov 13 14:34:43 CET 2008


Revision: 17443
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17443
Author:   campbellbarton
Date:     2008-11-13 14:34:43 +0100 (Thu, 13 Nov 2008)

Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r17405:HEAD

Modified Paths:
--------------
    branches/projection-paint/SConstruct
    branches/projection-paint/config/win32-mingw-config.py
    branches/projection-paint/config/win32-vc-config.py
    branches/projection-paint/intern/elbeem/SConscript
    branches/projection-paint/projectfiles_vc9/blender/blender.sln
    branches/projection-paint/projectfiles_vc9/blender/nodes/nodes.vcproj
    branches/projection-paint/source/Makefile
    branches/projection-paint/source/blender/blenkernel/BKE_bad_level_calls.h
    branches/projection-paint/source/blender/blenkernel/BKE_node.h
    branches/projection-paint/source/blender/blenkernel/SConscript
    branches/projection-paint/source/blender/blenkernel/bad_level_call_stubs/stubs.c
    branches/projection-paint/source/blender/blenkernel/intern/library.c
    branches/projection-paint/source/blender/blenkernel/intern/material.c
    branches/projection-paint/source/blender/blenkernel/intern/node.c
    branches/projection-paint/source/blender/blenkernel/intern/texture.c
    branches/projection-paint/source/blender/blenlib/BLI_linklist.h
    branches/projection-paint/source/blender/blenlib/BLI_memarena.h
    branches/projection-paint/source/blender/blenlib/SConscript
    branches/projection-paint/source/blender/blenlib/intern/BLI_linklist.c
    branches/projection-paint/source/blender/blenlib/intern/BLI_memarena.c
    branches/projection-paint/source/blender/blenloader/SConscript
    branches/projection-paint/source/blender/blenloader/intern/readfile.c
    branches/projection-paint/source/blender/blenloader/intern/writefile.c
    branches/projection-paint/source/blender/imbuf/SConscript
    branches/projection-paint/source/blender/include/BSE_node.h
    branches/projection-paint/source/blender/include/blendef.h
    branches/projection-paint/source/blender/include/butspace.h
    branches/projection-paint/source/blender/makesdna/DNA_node_types.h
    branches/projection-paint/source/blender/makesdna/DNA_texture_types.h
    branches/projection-paint/source/blender/makesdna/intern/SConscript
    branches/projection-paint/source/blender/nodes/CMakeLists.txt
    branches/projection-paint/source/blender/nodes/Makefile
    branches/projection-paint/source/blender/nodes/SConscript
    branches/projection-paint/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
    branches/projection-paint/source/blender/nodes/intern/SHD_util.c
    branches/projection-paint/source/blender/render/SConscript
    branches/projection-paint/source/blender/render/extern/include/RE_shader_ext.h
    branches/projection-paint/source/blender/render/intern/include/pixelshading.h
    branches/projection-paint/source/blender/render/intern/include/texture.h
    branches/projection-paint/source/blender/render/intern/source/convertblender.c
    branches/projection-paint/source/blender/render/intern/source/pixelshading.c
    branches/projection-paint/source/blender/render/intern/source/rayshade.c
    branches/projection-paint/source/blender/render/intern/source/rendercore.c
    branches/projection-paint/source/blender/render/intern/source/texture.c
    branches/projection-paint/source/blender/src/SConscript
    branches/projection-paint/source/blender/src/butspace.c
    branches/projection-paint/source/blender/src/buttons_shading.c
    branches/projection-paint/source/blender/src/drawnode.c
    branches/projection-paint/source/blender/src/editnode.c
    branches/projection-paint/source/blender/src/header_node.c
    branches/projection-paint/source/blender/src/headerbuttons.c
    branches/projection-paint/source/blender/src/imagepaint.c
    branches/projection-paint/source/blender/src/toolbox.c
    branches/projection-paint/source/creator/SConscript
    branches/projection-paint/source/gameengine/GameLogic/SConscript
    branches/projection-paint/source/gameengine/Ketsji/SConscript
    branches/projection-paint/tools/Blender.py
    branches/projection-paint/tools/btools.py

Added Paths:
-----------
    branches/projection-paint/source/blender/nodes/TEX_node.h
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/Makefile
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_image.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_invert.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_math.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_output.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
    branches/projection-paint/source/blender/nodes/intern/TEX_util.c
    branches/projection-paint/source/blender/nodes/intern/TEX_util.h

Removed Paths:
-------------
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/Makefile
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_image.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_invert.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_math.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_output.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
    branches/projection-paint/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c

Modified: branches/projection-paint/SConstruct
===================================================================
--- branches/projection-paint/SConstruct	2008-11-13 13:17:04 UTC (rev 17442)
+++ branches/projection-paint/SConstruct	2008-11-13 13:34:43 UTC (rev 17443)
@@ -57,8 +57,8 @@
 ##### BEGIN SETUP #####
 
 B.possible_types = ['core', 'common', 'blender', 'intern',
-                    'international', 'game', 'game2',
-                    'player', 'player2', 'system']
+					'international', 'game', 'game2',
+					'player', 'player2', 'system']
 
 B.binarykind = ['blender' , 'blenderplayer']
 ##################################
@@ -67,15 +67,15 @@
 # XX cheating for BF_FANCY, we check for BF_FANCY before args are validated
 use_color = ARGUMENTS.get('BF_FANCY', '1')
 if platform=='win32':
-    use_color = None
+	use_color = None
 
 if not use_color=='1':
-    B.bc.disable()
-    
+	B.bc.disable()
+	
  #on defaut white Os X terminal, some colors are totally unlegible
 if platform=='darwin':
-    B.bc.OKGREEN = '\033[34m'
-    B.bc.WARNING = '\033[36m'
+	B.bc.OKGREEN = '\033[34m'
+	B.bc.WARNING = '\033[36m'
 
 # arguments
 print B.bc.HEADER+'Command-line arguments'+B.bc.ENDC
@@ -98,247 +98,247 @@
 quickdebug = B.arguments.get('BF_QUICKDEBUG', None)
 
 if quickdebug:
-    B.quickdebug=string.split(quickdebug, ',')
+	B.quickdebug=string.split(quickdebug, ',')
 else:
-    B.quickdebug=[]
+	B.quickdebug=[]
 
 if quickie:
-    B.quickie=string.split(quickie,',')
+	B.quickie=string.split(quickie,',')
 else:
-    B.quickie=[]
-    
+	B.quickie=[]
+	
 toolset = B.arguments.get('BF_TOOLSET', None)
 if toolset:
-    print "Using " + toolset
-    if toolset=='mstoolkit':
-        env = BlenderEnvironment(ENV = os.environ)
-        env.Tool('mstoolkit', ['tools'])
-    else:
-        env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
-        if env:
-            btools.SetupSpawn(env)
+	print "Using " + toolset
+	if toolset=='mstoolkit':
+		env = BlenderEnvironment(ENV = os.environ)
+		env.Tool('mstoolkit', ['tools'])
+	else:
+		env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
+		if env:
+			btools.SetupSpawn(env)
 else:
-    env = BlenderEnvironment(ENV = os.environ)
+	env = BlenderEnvironment(ENV = os.environ)
 
 if not env:
-    print "Could not create a build environment"
-    Exit()
+	print "Could not create a build environment"
+	Exit()
 
 
 cc = B.arguments.get('CC', None)
 cxx = B.arguments.get('CXX', None)
 if cc:
-    env['CC'] = cc
+	env['CC'] = cc
 if cxx:
-    env['CXX'] = cxx
+	env['CXX'] = cxx
 
 if env['CC'] in ['cl', 'cl.exe'] and sys.platform=='win32':
-    platform = 'win32-vc'
+	platform = 'win32-vc'
 elif env['CC'] in ['gcc'] and sys.platform=='win32':
-    platform = 'win32-mingw'
+	platform = 'win32-mingw'
 
 env.SConscriptChdir(0)
 
 crossbuild = B.arguments.get('BF_CROSS', None)
 if crossbuild and platform!='win32':
-    platform = 'linuxcross'
+	platform = 'linuxcross'
 
 env['OURPLATFORM'] = platform
 
 configfile = 'config'+os.sep+platform+'-config.py'
 
 if os.path.exists(configfile):
-    print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + configfile
+	print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + configfile
 else:
-    print B.bc.FAIL + configfile + " doesn't exist" + B.bc.ENDC
+	print B.bc.FAIL + configfile + " doesn't exist" + B.bc.ENDC
 
 if crossbuild and env['PLATFORM'] != 'win32':
-    print B.bc.HEADER+"Preparing for crossbuild"+B.bc.ENDC
-    env.Tool('crossmingw', ['tools'])
-    # todo: determine proper libs/includes etc.
-    # Needed for gui programs, console programs should do without it
-    env.Append(LINKFLAGS=['-mwindows'])
+	print B.bc.HEADER+"Preparing for crossbuild"+B.bc.ENDC
+	env.Tool('crossmingw', ['tools'])
+	# todo: determine proper libs/includes etc.
+	# Needed for gui programs, console programs should do without it
+	env.Append(LINKFLAGS=['-mwindows'])
 
 userconfig = B.arguments.get('BF_CONFIG', 'user-config.py')
 # first read platform config. B.arguments will override
 optfiles = [configfile]
 if os.path.exists(userconfig):
-    print B.bc.OKGREEN + "Using user-config file: " + B.bc.ENDC + userconfig
-    optfiles += [userconfig]
+	print B.bc.OKGREEN + "Using user-config file: " + B.bc.ENDC + userconfig
+	optfiles += [userconfig]
 else:
-    print B.bc.WARNING + userconfig + " not found, no user overrides" + B.bc.ENDC
+	print B.bc.WARNING + userconfig + " not found, no user overrides" + B.bc.ENDC
 
 opts = btools.read_opts(optfiles, B.arguments)
 opts.Update(env)
 
 if not env['BF_FANCY']:
-    B.bc.disable()
+	B.bc.disable()
 
 SetOption('num_jobs', int(env['BF_NUMJOBS']))
 print "Build with %d parallel jobs" % (GetOption('num_jobs'))
 
 # disable elbeem (fluidsim) compilation?
 if env['BF_NO_ELBEEM'] == 1:
-    env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
-    env['CXXFLAGS'].append('-DDISABLE_ELBEEM')
-    env['CCFLAGS'].append('-DDISABLE_ELBEEM')
+	env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
+	env['CXXFLAGS'].append('-DDISABLE_ELBEEM')
+	env['CCFLAGS'].append('-DDISABLE_ELBEEM')
 
 if env['WITH_BF_OPENMP'] == 1:
-        if env['OURPLATFORM']=='win32-vc':
-                env['CCFLAGS'].append('/openmp')
-                env['CPPFLAGS'].append('/openmp')
-                env['CXXFLAGS'].append('/openmp')
-        else:
-            if env['CC'][-3:] == 'icc': # to be able to handle CC=/opt/bla/icc case
-                env.Append(LINKFLAGS=['-openmp', '-static-intel'])
-                env['CCFLAGS'].append('-openmp')
-                env['CPPFLAGS'].append('-openmp')
-                env['CXXFLAGS'].append('-openmp')
-            else:
-                env.Append(CCFLAGS=['-fopenmp']) 
-                env.Append(CPPFLAGS=['-fopenmp'])
-                env.Append(CXXFLAGS=['-fopenmp'])
-                # env.Append(LINKFLAGS=['-fprofile-generate'])
+		if env['OURPLATFORM']=='win32-vc':
+				env['CCFLAGS'].append('/openmp')
+				env['CPPFLAGS'].append('/openmp')
+				env['CXXFLAGS'].append('/openmp')
+		else:
+			if env['CC'][-3:] == 'icc': # to be able to handle CC=/opt/bla/icc case
+				env.Append(LINKFLAGS=['-openmp', '-static-intel'])
+				env['CCFLAGS'].append('-openmp')
+				env['CPPFLAGS'].append('-openmp')
+				env['CXXFLAGS'].append('-openmp')
+			else:
+				env.Append(CCFLAGS=['-fopenmp']) 
+				env.Append(CPPFLAGS=['-fopenmp'])
+				env.Append(CXXFLAGS=['-fopenmp'])
+				# env.Append(LINKFLAGS=['-fprofile-generate'])
 
 #check for additional debug libnames
 
 if env.has_key('BF_DEBUG_LIBS'):
-    B.quickdebug += env['BF_DEBUG_LIBS']
+	B.quickdebug += env['BF_DEBUG_LIBS']
 
 printdebug = B.arguments.get('BF_LISTDEBUG', 0)
 
 # see if this linux distro has libalut
 
 if env['OURPLATFORM'] == 'linux2' :
-    if env['WITH_BF_OPENAL']:
-        mylib_test_source_file = """
-        #include "AL/alut.h"
-        int main(int argc, char **argv)
-        {
-            alutGetMajorVersion();
-            return 0;
-        }
-        """
+	if env['WITH_BF_OPENAL']:
+		mylib_test_source_file = """
+		#include "AL/alut.h"
+		int main(int argc, char **argv)
+		{
+			alutGetMajorVersion();
+			return 0;
+		}
+		"""
 
-        def CheckFreeAlut(context,env):
-            context.Message( B.bc.OKGREEN + "Linux platform detected:\n  checking for FreeAlut... " + B.bc.ENDC )
-            env['LIBS'] = 'alut'
-            result = context.TryLink(mylib_test_source_file, '.c')
-            context.Result(result)
-            return result
+		def CheckFreeAlut(context,env):
+			context.Message( B.bc.OKGREEN + "Linux platform detected:\n  checking for FreeAlut... " + B.bc.ENDC )
+			env['LIBS'] = 'alut'
+			result = context.TryLink(mylib_test_source_file, '.c')
+			context.Result(result)
+			return result
 
-        env2 = env.Clone( LIBPATH = env['BF_OPENAL'] ) 
-        sconf_temp = mkdtemp()
-        conf = Configure( env2, {'CheckFreeAlut' : CheckFreeAlut}, sconf_temp, '/dev/null' )
-        if conf.CheckFreeAlut( env2 ):
-            env['BF_OPENAL_LIB'] += ' alut'
-        del env2
-        root = ''
-        for root, dirs, files in os.walk(sconf_temp, topdown=False):
-            for name in files:
-                os.remove(os.path.join(root, name))
-            for name in dirs:
-                os.rmdir(os.path.join(root, name))
-        if root: os.rmdir(root)
+		env2 = env.Clone( LIBPATH = env['BF_OPENAL'] ) 
+		sconf_temp = mkdtemp()
+		conf = Configure( env2, {'CheckFreeAlut' : CheckFreeAlut}, sconf_temp, '/dev/null' )
+		if conf.CheckFreeAlut( env2 ):
+			env['BF_OPENAL_LIB'] += ' alut'
+		del env2
+		root = ''
+		for root, dirs, files in os.walk(sconf_temp, topdown=False):
+			for name in files:
+				os.remove(os.path.join(root, name))
+			for name in dirs:
+				os.rmdir(os.path.join(root, name))
+		if root: os.rmdir(root)
 
 if len(B.quickdebug) > 0 and printdebug != 0:
-    print B.bc.OKGREEN + "Buildings these libs with debug symbols:" + B.bc.ENDC
-    for l in B.quickdebug:
-        print "\t" + l
+	print B.bc.OKGREEN + "Buildings these libs with debug symbols:" + B.bc.ENDC
+	for l in B.quickdebug:
+		print "\t" + l
 
 # remove stdc++ from LLIBS if we are building a statc linked CXXFLAGS
 if env['WITH_BF_STATICCXX']:
-    if 'stdc++' in env['LLIBS']:
-        env['LLIBS'] = env['LLIBS'].replace('stdc++', ' ')
-    else:
-        print '\tcould not remove stdc++ library from LLIBS, WITH_BF_STATICCXX may not work for your platform'
+	if 'stdc++' in env['LLIBS']:
+		env['LLIBS'] = env['LLIBS'].replace('stdc++', ' ')
+	else:
+		print '\tcould not remove stdc++ library from LLIBS, WITH_BF_STATICCXX may not work for your platform'
 
 # check target for blenderplayer. Set WITH_BF_PLAYER if found on cmdline
 if 'blenderplayer' in B.targets:
-    env['WITH_BF_PLAYER'] = True
+	env['WITH_BF_PLAYER'] = True
 
 if 'blendernogame' in B.targets:
-    env['WITH_BF_GAMEENGINE'] = False
+	env['WITH_BF_GAMEENGINE'] = False
 
 if 'blenderlite' in B.targets:
-    env['WITH_BF_GAMEENGINE'] = False
-    env['WITH_BF_OPENAL'] = False
-    env['WITH_BF_OPENEXR'] = False
-    env['WITH_BF_ICONV'] = False
-    env['WITH_BF_INTERNATIONAL'] = False
-    env['WITH_BF_OPENJPEG'] = False
-    env['WITH_BF_FFMPEG'] = False
-    env['WITH_BF_QUICKTIME'] = False
-    env['WITH_BF_YAFRAY'] = False
-    env['WITH_BF_REDCODE'] = False
-    env['WITH_BF_FTGL'] = False
-    env['WITH_BF_DDS'] = False
-    env['WITH_BF_ZLIB'] = False
-    env['WITH_BF_SDL'] = False
-    env['WITH_BF_JPEG'] = False
-    env['WITH_BF_PNG'] = False
-    env['WITH_BF_ODE'] = False

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list