[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49519] branches/soc-2011-tomato: Merging r49499 through r49518 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Fri Aug 3 11:08:41 CEST 2012
Revision: 49519
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49519
Author: nazgul
Date: 2012-08-03 09:08:40 +0000 (Fri, 03 Aug 2012)
Log Message:
-----------
Merging r49499 through r49518 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49499
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49518
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/build_files/cmake/config/blender_lite.cmake
branches/soc-2011-tomato/build_files/scons/tools/btools.py
branches/soc-2011-tomato/extern/CMakeLists.txt
branches/soc-2011-tomato/extern/SConscript
branches/soc-2011-tomato/intern/CMakeLists.txt
branches/soc-2011-tomato/intern/SConscript
branches/soc-2011-tomato/intern/bsp/CMakeLists.txt
branches/soc-2011-tomato/intern/bsp/SConscript
branches/soc-2011-tomato/intern/bsp/intern/CSG_BooleanOps.cpp
branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/writeavi.c
branches/soc-2011-tomato/source/blender/editors/object/object_add.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_buttons.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_header.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_intern.h
branches/soc-2011-tomato/source/blender/editors/space_node/node_ops.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_select.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_templates.c
branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c
branches/soc-2011-tomato/source/blender/imbuf/intern/imageprocess.c
branches/soc-2011-tomato/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2011-tomato/source/blender/imbuf/intern/scaling.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject.cpp
branches/soc-2011-tomato/source/blender/render/intern/source/envmap.c
branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
branches/soc-2011-tomato/source/blenderplayer/CMakeLists.txt
branches/soc-2011-tomato/source/creator/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.cpp
Added Paths:
-----------
branches/soc-2011-tomato/intern/bsp/intern/BOP_CarveInterface.cpp
branches/soc-2011-tomato/intern/bsp/intern/BOP_Interface.h
branches/soc-2011-tomato/source/blender/editors/space_node/node_view.c
Removed Paths:
-------------
branches/soc-2011-tomato/intern/boolop/CMakeLists.txt
branches/soc-2011-tomato/intern/boolop/SConscript
branches/soc-2011-tomato/intern/boolop/extern/BOP_Interface.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_BBox.cpp
branches/soc-2011-tomato/intern/boolop/intern/BOP_BBox.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_BSPNode.cpp
branches/soc-2011-tomato/intern/boolop/intern/BOP_BSPNode.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_BSPTree.cpp
branches/soc-2011-tomato/intern/boolop/intern/BOP_BSPTree.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_CarveInterface.cpp
branches/soc-2011-tomato/intern/boolop/intern/BOP_Chrono.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_Edge.cpp
branches/soc-2011-tomato/intern/boolop/intern/BOP_Edge.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_Face.cpp
branches/soc-2011-tomato/intern/boolop/intern/BOP_Face.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_Face2Face.cpp
branches/soc-2011-tomato/intern/boolop/intern/BOP_Face2Face.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_Indexs.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_Interface.cpp
branches/soc-2011-tomato/intern/boolop/intern/BOP_MathUtils.cpp
branches/soc-2011-tomato/intern/boolop/intern/BOP_MathUtils.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_Merge.cpp
branches/soc-2011-tomato/intern/boolop/intern/BOP_Merge.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_Merge2.cpp
branches/soc-2011-tomato/intern/boolop/intern/BOP_Merge2.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_Mesh.cpp
branches/soc-2011-tomato/intern/boolop/intern/BOP_Mesh.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_Misc.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_Segment.cpp
branches/soc-2011-tomato/intern/boolop/intern/BOP_Segment.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_Splitter.cpp
branches/soc-2011-tomato/intern/boolop/intern/BOP_Splitter.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_Tag.cpp
branches/soc-2011-tomato/intern/boolop/intern/BOP_Tag.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_Triangulator.cpp
branches/soc-2011-tomato/intern/boolop/intern/BOP_Triangulator.h
branches/soc-2011-tomato/intern/boolop/intern/BOP_Vertex.cpp
branches/soc-2011-tomato/intern/boolop/intern/BOP_Vertex.h
branches/soc-2011-tomato/source/blender/editors/space_node/node_state.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49498
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49518
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-08-02 23:03:16 UTC (rev 49518)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-08-03 09:08:40 UTC (rev 49519)
@@ -227,9 +227,6 @@
# Camera/motion tracking
option(WITH_LIBMV "Enable libmv structure from motion library" ON)
-# Mesh boolean lib
-option(WITH_CARVE "Enable Carve library to handle mesh boolean operations" ON)
-
# Misc
option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
@@ -365,8 +362,8 @@
set(WITH_OPENIMAGEIO ON)
endif()
-# auto enable boost for cycles and carve
-if(WITH_CYCLES OR WITH_CARVE OR WITH_OPENCOLORIO)
+# auto enable boost for cycles and booleans
+if(WITH_CYCLES OR WITH_MOD_BOOLEAN)
set(WITH_BOOST ON)
endif()
@@ -1149,10 +1146,17 @@
endif()
if(WITH_IMAGE_OPENEXR)
- set(OPENEXR ${LIBDIR}/openexr)
- set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
- set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
- set(OPENEXR_LIBPATH ${OPENEXR}/lib)
+ if(MSVC10)
+ set(OPENEXR ${LIBDIR}/openexr)
+ set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/vc_10)
+ set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
+ set(OPENEXR_LIBPATH ${OPENEXR}/lib/vc_10)
+ else()
+ set(OPENEXR ${LIBDIR}/openexr)
+ set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include)
+ set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
+ set(OPENEXR_LIBPATH ${OPENEXR}/lib)
+ endif()
endif()
if(WITH_IMAGE_TIFF)
@@ -1694,9 +1698,6 @@
# MSVC2010 fails to links C++ libs right
if(MSVC10)
- if(WITH_IMAGE_OPENEXR)
- message(WARNING "MSVC 2010 does not support OpenEXR, disabling WITH_IMAGE_OPENEXR. To enable support use Use MSVC 2008")
- endif()
if(WITH_OPENCOLLADA)
message(WARNING "MSVC 2010 does not support OpenCollada, disabling WITH_OPENCOLLADA. To enable support use Use MSVC 2008")
endif()
Modified: branches/soc-2011-tomato/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/config/blender_lite.cmake 2012-08-02 23:03:16 UTC (rev 49518)
+++ branches/soc-2011-tomato/build_files/cmake/config/blender_lite.cmake 2012-08-03 09:08:40 UTC (rev 49519)
@@ -15,7 +15,6 @@
set(WITH_CYCLES OFF CACHE FORCE BOOL)
set(WITH_FFTW3 OFF CACHE FORCE BOOL)
set(WITH_LIBMV OFF CACHE FORCE BOOL)
-set(WITH_CARVE OFF CACHE FORCE BOOL)
set(WITH_GAMEENGINE OFF CACHE FORCE BOOL)
set(WITH_COMPOSITOR OFF CACHE FORCE BOOL)
set(WITH_GHOST_XDND OFF CACHE FORCE BOOL)
Modified: branches/soc-2011-tomato/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/tools/btools.py 2012-08-02 23:03:16 UTC (rev 49518)
+++ branches/soc-2011-tomato/build_files/scons/tools/btools.py 2012-08-03 09:08:40 UTC (rev 49519)
@@ -165,7 +165,7 @@
'WITH_BF_OIIO', 'WITH_BF_STATICOIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIB_STATIC', 'BF_OIIO_LIBPATH',
'WITH_BF_OCIO', 'WITH_BF_STATICOCIO', 'BF_OCIO', 'BF_OCIO_INC', 'BF_OCIO_LIB', 'BF_OCIO_LIB_STATIC', 'BF_OCIO_LIBPATH',
'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH',
- 'WITH_BF_LIBMV', 'WITH_BF_CARVE'
+ 'WITH_BF_LIBMV'
]
# Have options here that scons expects to be lists
@@ -531,7 +531,6 @@
(BoolVariable('WITH_BF_LZO', 'Enable fast LZO pointcache compression', True)),
(BoolVariable('WITH_BF_LZMA', 'Enable best LZMA pointcache compression', True)),
- (BoolVariable('WITH_BF_CARVE', 'Enable carve library for mesh boolean operations', True)),
(BoolVariable('WITH_BF_LIBMV', 'Enable libmv structure from motion library', True)),
Modified: branches/soc-2011-tomato/extern/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/extern/CMakeLists.txt 2012-08-02 23:03:16 UTC (rev 49518)
+++ branches/soc-2011-tomato/extern/CMakeLists.txt 2012-08-03 09:08:40 UTC (rev 49519)
@@ -68,7 +68,7 @@
add_subdirectory(libmv)
endif()
-if(WITH_CARVE)
+if(WITH_MOD_BOOLEAN)
add_subdirectory(carve)
endif()
Modified: branches/soc-2011-tomato/extern/SConscript
===================================================================
--- branches/soc-2011-tomato/extern/SConscript 2012-08-02 23:03:16 UTC (rev 49518)
+++ branches/soc-2011-tomato/extern/SConscript 2012-08-03 09:08:40 UTC (rev 49519)
@@ -32,7 +32,7 @@
if env['WITH_BF_LIBMV']:
SConscript(['libmv/SConscript'])
-if env['WITH_BF_CARVE']:
+if env['WITH_BF_BOOLEAN']:
SConscript(['carve/SConscript'])
if env['WITH_GHOST_XDND']:
Modified: branches/soc-2011-tomato/intern/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/intern/CMakeLists.txt 2012-08-02 23:03:16 UTC (rev 49518)
+++ branches/soc-2011-tomato/intern/CMakeLists.txt 2012-08-03 09:08:40 UTC (rev 49519)
@@ -55,7 +55,6 @@
endif()
if(WITH_MOD_BOOLEAN)
- add_subdirectory(boolop)
add_subdirectory(bsp)
endif()
Modified: branches/soc-2011-tomato/intern/SConscript
===================================================================
--- branches/soc-2011-tomato/intern/SConscript 2012-08-02 23:03:16 UTC (rev 49518)
+++ branches/soc-2011-tomato/intern/SConscript 2012-08-03 09:08:40 UTC (rev 49519)
@@ -11,7 +11,6 @@
'decimation/SConscript',
'iksolver/SConscript',
'itasc/SConscript',
- 'boolop/SConscript',
'opennl/SConscript',
'mikktspace/SConscript',
'smoke/SConscript',
@@ -26,7 +25,8 @@
if env['WITH_BF_CYCLES']:
SConscript(['cycles/SConscript'])
-SConscript(['bsp/SConscript'])
+if env['WITH_BF_BOOLEAN']:
+ SConscript(['bsp/SConscript'])
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'):
SConscript(['utfconv/SConscript'])
Deleted: branches/soc-2011-tomato/intern/boolop/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/intern/boolop/CMakeLists.txt 2012-08-02 23:03:16 UTC (rev 49518)
+++ branches/soc-2011-tomato/intern/boolop/CMakeLists.txt 2012-08-03 09:08:40 UTC (rev 49519)
@@ -1,111 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Jacques Beaurain.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-remove_strict_flags()
-
-set(INC
- .
- extern
- intern
- ../container
- ../guardedalloc
- ../memutil
- ../moto/include
- ../../source/blender/blenlib
- ../../source/blender/makesdna
-)
-
-set(INC_SYS
-
-)
-
-if(NOT WITH_CARVE)
- set(SRC
- intern/BOP_BBox.cpp
- intern/BOP_BSPNode.cpp
- intern/BOP_BSPTree.cpp
- intern/BOP_Edge.cpp
- intern/BOP_Face.cpp
- intern/BOP_Face2Face.cpp
- intern/BOP_Interface.cpp
- intern/BOP_MathUtils.cpp
- intern/BOP_Merge.cpp
- intern/BOP_Merge2.cpp
- intern/BOP_Mesh.cpp
- intern/BOP_Segment.cpp
- intern/BOP_Splitter.cpp
- intern/BOP_Tag.cpp
- intern/BOP_Triangulator.cpp
- intern/BOP_Vertex.cpp
-
- extern/BOP_Interface.h
- intern/BOP_BBox.h
- intern/BOP_BSPNode.h
- intern/BOP_BSPTree.h
- intern/BOP_Chrono.h
- intern/BOP_Edge.h
- intern/BOP_Face.h
- intern/BOP_Face2Face.h
- intern/BOP_Indexs.h
- intern/BOP_MathUtils.h
- intern/BOP_Merge.h
- intern/BOP_Merge2.h
- intern/BOP_Mesh.h
- intern/BOP_Misc.h
- intern/BOP_Segment.h
- intern/BOP_Splitter.h
- intern/BOP_Tag.h
- intern/BOP_Triangulator.h
- intern/BOP_Vertex.h
- )
-else()
- set(SRC
- intern/BOP_CarveInterface.cpp
- extern/BOP_Interface.h
- )
-
- list(APPEND INC
- ../../extern/carve/include
- )
-
- if(WITH_BOOST)
- if(NOT MSVC)
- # Boost is setting as preferred collections library in the Carve code when using MSVC compiler
- add_definitions(
- -DHAVE_BOOST_UNORDERED_COLLECTIONS
- )
- endif()
-
- add_definitions(
- -DCARVE_SYSTEM_BOOST
- )
-
- list(APPEND INC
- ${BOOST_INCLUDE_DIR}
- )
- endif()
-endif()
-
-blender_add_lib(bf_intern_bop "${SRC}" "${INC}" "${INC_SYS}")
Deleted: branches/soc-2011-tomato/intern/boolop/SConscript
===================================================================
--- branches/soc-2011-tomato/intern/boolop/SConscript 2012-08-02 23:03:16 UTC (rev 49518)
+++ branches/soc-2011-tomato/intern/boolop/SConscript 2012-08-03 09:08:40 UTC (rev 49519)
@@ -1,31 +0,0 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list