[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37212] branches/soc-2011-salad: Merged onion branch

Jason Wilkins Jason.A.Wilkins at gmail.com
Sun Jun 5 16:49:12 CEST 2011 

Revision: 37212
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37212
Author:   jwilkins
Date:     2011-06-05 14:49:11 +0000 (Sun, 05 Jun 2011)
Log Message:
-----------
Merged onion branch

Everything merged pretty cleanly.  There are problems with the blender manpage file, looks like the eol-style is wrong, but the property seems to be set right (every time I merge this file gets completely replaced)

Tried to test compile, but there are build errors from rna_fcurve.c that were introduced in 35172 I think (undefined identifiers min and max)

Modified Paths:
--------------
    branches/soc-2011-salad/CMakeLists.txt
    branches/soc-2011-salad/build_files/scons/config/aix4-config.py
    branches/soc-2011-salad/build_files/scons/config/darwin-config.py
    branches/soc-2011-salad/build_files/scons/config/freebsd7-config.py
    branches/soc-2011-salad/build_files/scons/config/freebsd8-config.py
    branches/soc-2011-salad/build_files/scons/config/freebsd9-config.py
    branches/soc-2011-salad/build_files/scons/config/irix6-config.py
    branches/soc-2011-salad/build_files/scons/config/linux2-config.py
    branches/soc-2011-salad/build_files/scons/config/linuxcross-config.py
    branches/soc-2011-salad/build_files/scons/config/openbsd3-config.py
    branches/soc-2011-salad/build_files/scons/config/sunos5-config.py
    branches/soc-2011-salad/build_files/scons/config/win32-mingw-config.py
    branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
    branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py
    branches/soc-2011-salad/build_files/scons/tools/btools.py
    branches/soc-2011-salad/intern/ghost/SConscript
    branches/soc-2011-salad/intern/ghost/intern/GHOST_WindowCarbon.cpp
    branches/soc-2011-salad/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2011-salad/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2011-salad/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_texture.py
    branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-salad/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2011-salad/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-salad/source/blender/blenkernel/BKE_brush.h
    branches/soc-2011-salad/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2011-salad/source/blender/blenkernel/BKE_material.h
    branches/soc-2011-salad/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2011-salad/source/blender/blenkernel/BKE_paint.h
    branches/soc-2011-salad/source/blender/blenkernel/BKE_subsurf.h
    branches/soc-2011-salad/source/blender/blenkernel/BKE_texture.h
    branches/soc-2011-salad/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/CCGSubSurf.h
    branches/soc-2011-salad/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/customdata.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/material.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/mesh.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/multires.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/object.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/paint.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/shrinkwrap.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2011-salad/source/blender/blenkernel/intern/texture.c
    branches/soc-2011-salad/source/blender/blenlib/BLI_editVert.h
    branches/soc-2011-salad/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2011-salad/source/blender/blenlib/BLI_pbvh.h
    branches/soc-2011-salad/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2011-salad/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2011-salad/source/blender/blenlib/intern/pbvh.c
    branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-salad/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-salad/source/blender/editors/include/ED_mesh.h
    branches/soc-2011-salad/source/blender/editors/include/ED_sculpt.h
    branches/soc-2011-salad/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-salad/source/blender/editors/interface/resources.c
    branches/soc-2011-salad/source/blender/editors/mesh/mesh_data.c
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/SConscript
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/soc-2011-salad/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2011-salad/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-salad/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-salad/source/blender/gpu/GPU_buffers.h
    branches/soc-2011-salad/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2011-salad/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2011-salad/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-salad/source/blender/gpu/intern/gpu_material.c
    branches/soc-2011-salad/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2011-salad/source/blender/imbuf/intern/divers.c
    branches/soc-2011-salad/source/blender/imbuf/intern/scaling.c
    branches/soc-2011-salad/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_customdata_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_object_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2011-salad/source/blender/makesrna/RNA_access.h
    branches/soc-2011-salad/source/blender/makesrna/SConscript
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-salad/source/blender/modifiers/intern/MOD_subsurf.c
    branches/soc-2011-salad/source/blender/modifiers/intern/MOD_util.c
    branches/soc-2011-salad/source/blender/modifiers/intern/MOD_util.h
    branches/soc-2011-salad/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2011-salad/source/blender/windowmanager/SConscript
    branches/soc-2011-salad/source/blender/windowmanager/intern/wm_draw.c
    branches/soc-2011-salad/source/blender/windowmanager/intern/wm_operators.c

Added Paths:
-----------
    branches/soc-2011-salad/source/blender/blenkernel/BKE_dmgrid.h
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_mask.c
    branches/soc-2011-salad/source/kernel/

Removed Paths:
-------------
    branches/soc-2011-salad/doc/blender_file_format/
    branches/soc-2011-salad/source/blender/makesrna/rna_cleanup/

Property Changed:
----------------
    branches/soc-2011-salad/


Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-pepper:36830-37151
/trunk/blender:36834-37206
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-29913
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37208
/branches/soc-2011-pepper:36830-37151
/trunk/blender:36834-37206

Modified: branches/soc-2011-salad/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/CMakeLists.txt	2011-06-05 14:33:15 UTC (rev 37211)
+++ branches/soc-2011-salad/CMakeLists.txt	2011-06-05 14:49:11 UTC (rev 37212)
@@ -160,6 +160,7 @@
 	option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
 endif()
 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
+option(WITH_ONSURFACEBRUSH       "Enable use of the 'on-surface brush' for paint/sculpt.  Requires a stencil buffer, GL_depth_texture, and GLSL" ON)
 
 # disable for now, but plan to support on all platforms eventually
 option(WITH_MEM_JEMALLOC   "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
@@ -1001,6 +1002,10 @@
 	endif()
 endif()
 
+if(WITH_ONSURFACEBRUSH)
+	add_definitions(-DWITH_ONSURFACEBRUSH)
+endif(WITH_ONSURFACEBRUSH)
+
 if(WITH_IMAGE_OPENJPEG)
 	if(UNIX AND NOT APPLE)
 		set(OPENJPEG /usr)

Modified: branches/soc-2011-salad/build_files/scons/config/aix4-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/aix4-config.py	2011-06-05 14:33:15 UTC (rev 37211)
+++ branches/soc-2011-salad/build_files/scons/config/aix4-config.py	2011-06-05 14:49:11 UTC (rev 37212)
@@ -149,6 +149,9 @@
 BF_REDCODE_INC = '${BF_REDCODE}/include'
 BF_REDCODE_LIBPATH='${BF_REDCODE}/lib'
 
+#On-Surface Brush
+WITH_BF_ONSURFACEBRUSH = True
+
 # Mesa Libs should go here if your using them as well....
 WITH_BF_STATICOPENGL = 'false'
 BF_OPENGL = '/usr'

Modified: branches/soc-2011-salad/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/darwin-config.py	2011-06-05 14:33:15 UTC (rev 37211)
+++ branches/soc-2011-salad/build_files/scons/config/darwin-config.py	2011-06-05 14:49:11 UTC (rev 37212)
@@ -265,6 +265,8 @@
 elif MACOSX_ARCHITECTURE == 'x86_64':
     BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-msse2']
     
+#On-Surface Brush
+WITH_BF_ONSURFACEBRUSH = True
 
 #############################################################################
 ###################  various compile settings and flags    ##################

Modified: branches/soc-2011-salad/build_files/scons/config/freebsd7-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/freebsd7-config.py	2011-06-05 14:33:15 UTC (rev 37211)
+++ branches/soc-2011-salad/build_files/scons/config/freebsd7-config.py	2011-06-05 14:49:11 UTC (rev 37212)
@@ -174,6 +174,9 @@
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
 
+#On-Surface Brush
+WITH_BF_ONSURFACEBRUSH = True
+
 CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE','-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
 
 CPPFLAGS = []

Modified: branches/soc-2011-salad/build_files/scons/config/freebsd8-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/freebsd8-config.py	2011-06-05 14:33:15 UTC (rev 37211)
+++ branches/soc-2011-salad/build_files/scons/config/freebsd8-config.py	2011-06-05 14:49:11 UTC (rev 37212)
@@ -174,6 +174,9 @@
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
 
+#On-Surface Brush
+WITH_BF_ONSURFACEBRUSH = True
+
 CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE','-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
 
 CPPFLAGS = []

Modified: branches/soc-2011-salad/build_files/scons/config/freebsd9-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/freebsd9-config.py	2011-06-05 14:33:15 UTC (rev 37211)
+++ branches/soc-2011-salad/build_files/scons/config/freebsd9-config.py	2011-06-05 14:49:11 UTC (rev 37212)
@@ -174,6 +174,9 @@
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
 
+#On-Surface Brush
+WITH_BF_ONSURFACEBRUSH = True
+
 CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE','-D_FILE_OFFSET_BITS=64','-D_LARGEFILE64_SOURCE']
 
 CPPFLAGS = []

Modified: branches/soc-2011-salad/build_files/scons/config/irix6-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/irix6-config.py	2011-06-05 14:33:15 UTC (rev 37211)
+++ branches/soc-2011-salad/build_files/scons/config/irix6-config.py	2011-06-05 14:49:11 UTC (rev 37212)
@@ -154,6 +154,8 @@
 BF_OPENGL_LIBPATH = '/usr/X11R6/lib'
 BF_OPENGL_LIB_STATIC = '${BF_OPENGL}/libGL.a ${BF_OPENGL}/libGLU.a ${BF_OPENGL}/libXxf86vm.a ${BF_OPENGL}/libX11.a ${BF_OPENGL}/libXi.a ${BF_OPENGL}/libXext.a ${BF_OPENGL}/libXxf86vm.a'
 
+#On-Surface Brush
+WITH_BF_ONSURFACEBRUSH = True
 
 CC = 'c99'
 CXX = 'CC'

Modified: branches/soc-2011-salad/build_files/scons/config/linux2-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/linux2-config.py	2011-06-05 14:33:15 UTC (rev 37211)
+++ branches/soc-2011-salad/build_files/scons/config/linux2-config.py	2011-06-05 14:49:11 UTC (rev 37212)
@@ -192,6 +192,9 @@
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']
 
+#On-Surface Brush
+WITH_BF_ONSURFACEBRUSH = True
+
 ##
 CC = 'gcc'
 CXX = 'g++'

Modified: branches/soc-2011-salad/build_files/scons/config/linuxcross-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/linuxcross-config.py	2011-06-05 14:33:15 UTC (rev 37211)
+++ branches/soc-2011-salad/build_files/scons/config/linuxcross-config.py	2011-06-05 14:49:11 UTC (rev 37212)
@@ -172,6 +172,9 @@
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
 
+#On-Surface Brush
+WITH_BF_ONSURFACEBRUSH = True
+
 CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
 
 CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE']

Modified: branches/soc-2011-salad/build_files/scons/config/openbsd3-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/openbsd3-config.py	2011-06-05 14:33:15 UTC (rev 37211)
+++ branches/soc-2011-salad/build_files/scons/config/openbsd3-config.py	2011-06-05 14:49:11 UTC (rev 37212)
@@ -111,6 +111,9 @@
 BF_OPENGL_LIBPATH = '${BF_OPENGL}/lib'
 BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
 
+#On-Surface Brush
+WITH_BF_ONSURFACEBRUSH = True
+
 ##
 ##CC = gcc
 ##CCC = g++

Modified: branches/soc-2011-salad/build_files/scons/config/sunos5-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/sunos5-config.py	2011-06-05 14:33:15 UTC (rev 37211)
+++ branches/soc-2011-salad/build_files/scons/config/sunos5-config.py	2011-06-05 14:49:11 UTC (rev 37212)
@@ -128,6 +128,9 @@
 BF_OPENGL_LIBPATH = '${BF_OPENGL}/lib'
 BF_OPENGL_LIB_STATIC = '${BF_OPENGL_LIBPATH}/libGL.a ${BF_OPENGL_LIBPATH}/libGLU.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a ${BF_OPENGL_LIBPATH}/libX11.a ${BF_OPENGL_LIBPATH}/libXi.a ${BF_OPENGL_LIBPATH}/libXext.a ${BF_OPENGL_LIBPATH}/libXxf86vm.a'
 
+#On-Surface Brush
+WITH_BF_ONSURFACEBRUSH = True
+
 ##
 CC = 'gcc'
 CXX = 'g++'

Modified: branches/soc-2011-salad/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/win32-mingw-config.py	2011-06-05 14:33:15 UTC (rev 37211)
+++ branches/soc-2011-salad/build_files/scons/config/win32-mingw-config.py	2011-06-05 14:49:11 UTC (rev 37212)
@@ -158,6 +158,9 @@
 WITH_BF_RAYOPTIMIZATION = False
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
 
+#On-Surface Brush
+WITH_BF_ONSURFACEBRUSH = True
+
 ##
 CC = 'gcc'
 CXX = 'g++'

Modified: branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py	2011-06-05 14:33:15 UTC (rev 37211)
+++ branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py	2011-06-05 14:49:11 UTC (rev 37212)
@@ -153,6 +153,9 @@
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']
 
+#On-Surface Brush
+WITH_BF_ONSURFACEBRUSH = True
+
 WITH_BF_STATICOPENGL = False
 BF_OPENGL_INC = '${BF_OPENGL}/include'
 BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'

Modified: branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py	2011-06-05 14:33:15 UTC (rev 37211)
+++ branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py	2011-06-05 14:49:11 UTC (rev 37212)
@@ -155,6 +155,9 @@
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']
 
+#On-Surface Brush
+WITH_BF_ONSURFACEBRUSH = True
+
 WITH_BF_STATICOPENGL = False
 BF_OPENGL_INC = '${BF_OPENGL}/include'
 BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'

Modified: branches/soc-2011-salad/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/tools/btools.py	2011-06-05 14:33:15 UTC (rev 37211)
+++ branches/soc-2011-salad/build_files/scons/tools/btools.py	2011-06-05 14:49:11 UTC (rev 37212)
@@ -132,6 +132,7 @@
             'BF_GHOST_DEBUG',

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list