[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41471] branches/cycles: Cycles: svn merge -r41266:41467 ^/trunk/blender
Brecht Van Lommel
brechtvanlommel at pandora.be
Wed Nov 2 17:17:06 CET 2011
Revision: 41471
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41471
Author: blendix
Date: 2011-11-02 16:17:05 +0000 (Wed, 02 Nov 2011)
Log Message:
-----------
Cycles: svn merge -r41266:41467 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41266
Modified Paths:
--------------
branches/cycles/CMakeLists.txt
branches/cycles/GNUmakefile
branches/cycles/SConstruct
branches/cycles/build_files/cmake/cmake_consistency_check.py
branches/cycles/build_files/cmake/cmake_consistency_check_config.py
branches/cycles/build_files/cmake/cmake_qtcreator_project.py
branches/cycles/build_files/cmake/macros.cmake
branches/cycles/build_files/cmake/project_info.py
branches/cycles/build_files/cmake/project_source_info.py
branches/cycles/build_files/scons/config/darwin-config.py
branches/cycles/build_files/scons/tools/btools.py
branches/cycles/doc/python_api/rst/info_quickstart.rst
branches/cycles/doc/python_api/rst/info_tips_and_tricks.rst
branches/cycles/doc/python_api/sphinx_doc_gen.py
branches/cycles/extern/CMakeLists.txt
branches/cycles/extern/SConscript
branches/cycles/intern/SConscript
branches/cycles/intern/ffmpeg/ffmpeg_compat.h
branches/cycles/intern/ghost/SConscript
branches/cycles/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/cycles/intern/ghost/intern/GHOST_WindowX11.cpp
branches/cycles/intern/itasc/CMakeLists.txt
branches/cycles/intern/itasc/ConstraintSet.cpp
branches/cycles/intern/itasc/ControlledObject.cpp
branches/cycles/intern/itasc/CopyPose.cpp
branches/cycles/intern/itasc/SConscript
branches/cycles/intern/itasc/Scene.cpp
branches/cycles/intern/itasc/WDLSSolver.cpp
branches/cycles/intern/itasc/WSDLSSolver.cpp
branches/cycles/intern/itasc/kdl/inertia.cpp
branches/cycles/intern/itasc/kdl/inertia.hpp
branches/cycles/intern/itasc/kdl/utilities/svd_eigen_HH.hpp
branches/cycles/intern/moto/CMakeLists.txt
branches/cycles/intern/opennl/CMakeLists.txt
branches/cycles/intern/opennl/SConscript
branches/cycles/intern/opennl/superlu/get_perm_c.c
branches/cycles/release/scripts/startup/bl_operators/image.py
branches/cycles/release/scripts/startup/bl_operators/wm.py
branches/cycles/release/scripts/startup/bl_ui/properties_world.py
branches/cycles/release/scripts/startup/bl_ui/space_view3d.py
branches/cycles/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/cycles/source/blender/blenfont/intern/blf_lang.c
branches/cycles/source/blender/blenkernel/BKE_deform.h
branches/cycles/source/blender/blenkernel/BKE_image.h
branches/cycles/source/blender/blenkernel/BKE_library.h
branches/cycles/source/blender/blenkernel/CMakeLists.txt
branches/cycles/source/blender/blenkernel/SConscript
branches/cycles/source/blender/blenkernel/intern/action.c
branches/cycles/source/blender/blenkernel/intern/anim.c
branches/cycles/source/blender/blenkernel/intern/armature.c
branches/cycles/source/blender/blenkernel/intern/blender.c
branches/cycles/source/blender/blenkernel/intern/brush.c
branches/cycles/source/blender/blenkernel/intern/constraint.c
branches/cycles/source/blender/blenkernel/intern/curve.c
branches/cycles/source/blender/blenkernel/intern/deform.c
branches/cycles/source/blender/blenkernel/intern/effect.c
branches/cycles/source/blender/blenkernel/intern/fcurve.c
branches/cycles/source/blender/blenkernel/intern/image.c
branches/cycles/source/blender/blenkernel/intern/ipo.c
branches/cycles/source/blender/blenkernel/intern/key.c
branches/cycles/source/blender/blenkernel/intern/lattice.c
branches/cycles/source/blender/blenkernel/intern/library.c
branches/cycles/source/blender/blenkernel/intern/material.c
branches/cycles/source/blender/blenkernel/intern/mball.c
branches/cycles/source/blender/blenkernel/intern/mesh.c
branches/cycles/source/blender/blenkernel/intern/mesh_validate.c
branches/cycles/source/blender/blenkernel/intern/node.c
branches/cycles/source/blender/blenkernel/intern/object.c
branches/cycles/source/blender/blenkernel/intern/particle.c
branches/cycles/source/blender/blenkernel/intern/particle_system.c
branches/cycles/source/blender/blenkernel/intern/smoke.c
branches/cycles/source/blender/blenkernel/intern/speaker.c
branches/cycles/source/blender/blenkernel/intern/texture.c
branches/cycles/source/blender/blenkernel/intern/world.c
branches/cycles/source/blender/blenkernel/intern/writeffmpeg.c
branches/cycles/source/blender/blenlib/BLI_bpath.h
branches/cycles/source/blender/blenlib/BLI_path_util.h
branches/cycles/source/blender/blenlib/BLI_string.h
branches/cycles/source/blender/blenlib/BLI_threads.h
branches/cycles/source/blender/blenlib/intern/bpath.c
branches/cycles/source/blender/blenlib/intern/math_rotation.c
branches/cycles/source/blender/blenlib/intern/path_util.c
branches/cycles/source/blender/blenlib/intern/string_utf8.c
branches/cycles/source/blender/blenlib/intern/threads.c
branches/cycles/source/blender/blenloader/BLO_readfile.h
branches/cycles/source/blender/blenloader/intern/readfile.c
branches/cycles/source/blender/blenloader/intern/writefile.c
branches/cycles/source/blender/blenpluginapi/intern/pluginapi.c
branches/cycles/source/blender/collada/ArmatureImporter.cpp
branches/cycles/source/blender/collada/ArmatureImporter.h
branches/cycles/source/blender/editors/CMakeLists.txt
branches/cycles/source/blender/editors/SConscript
branches/cycles/source/blender/editors/animation/anim_markers.c
branches/cycles/source/blender/editors/animation/keyframes_general.c
branches/cycles/source/blender/editors/animation/keyingsets.c
branches/cycles/source/blender/editors/armature/poseSlide.c
branches/cycles/source/blender/editors/armature/poseUtils.c
branches/cycles/source/blender/editors/armature/poseobject.c
branches/cycles/source/blender/editors/curve/curve_ops.c
branches/cycles/source/blender/editors/curve/editfont.c
branches/cycles/source/blender/editors/datafiles/CMakeLists.txt
branches/cycles/source/blender/editors/gpencil/drawgpencil.c
branches/cycles/source/blender/editors/gpencil/gpencil_paint.c
branches/cycles/source/blender/editors/include/ED_datafiles.h
branches/cycles/source/blender/editors/include/ED_mesh.h
branches/cycles/source/blender/editors/include/ED_screen.h
branches/cycles/source/blender/editors/include/ED_space_api.h
branches/cycles/source/blender/editors/include/UI_interface.h
branches/cycles/source/blender/editors/interface/interface.c
branches/cycles/source/blender/editors/interface/interface_handlers.c
branches/cycles/source/blender/editors/interface/interface_icons.c
branches/cycles/source/blender/editors/interface/interface_templates.c
branches/cycles/source/blender/editors/interface/resources.c
branches/cycles/source/blender/editors/mesh/editface.c
branches/cycles/source/blender/editors/mesh/editmesh_mods.c
branches/cycles/source/blender/editors/mesh/editmesh_tools.c
branches/cycles/source/blender/editors/metaball/mball_edit.c
branches/cycles/source/blender/editors/object/object_constraint.c
branches/cycles/source/blender/editors/object/object_lattice.c
branches/cycles/source/blender/editors/object/object_relations.c
branches/cycles/source/blender/editors/object/object_vgroup.c
branches/cycles/source/blender/editors/physics/CMakeLists.txt
branches/cycles/source/blender/editors/physics/particle_edit.c
branches/cycles/source/blender/editors/physics/physics_fluid.c
branches/cycles/source/blender/editors/render/render_internal.c
branches/cycles/source/blender/editors/render/render_opengl.c
branches/cycles/source/blender/editors/screen/screen_ops.c
branches/cycles/source/blender/editors/sculpt_paint/paint_vertex.c
branches/cycles/source/blender/editors/sound/sound_ops.c
branches/cycles/source/blender/editors/space_action/action_edit.c
branches/cycles/source/blender/editors/space_api/spacetypes.c
branches/cycles/source/blender/editors/space_console/console_ops.c
branches/cycles/source/blender/editors/space_file/filelist.c
branches/cycles/source/blender/editors/space_graph/graph_edit.c
branches/cycles/source/blender/editors/space_graph/graph_intern.h
branches/cycles/source/blender/editors/space_image/image_intern.h
branches/cycles/source/blender/editors/space_image/image_ops.c
branches/cycles/source/blender/editors/space_info/info_ops.c
branches/cycles/source/blender/editors/space_nla/nla_intern.h
branches/cycles/source/blender/editors/space_outliner/outliner_draw.c
branches/cycles/source/blender/editors/space_outliner/outliner_intern.h
branches/cycles/source/blender/editors/space_outliner/outliner_tools.c
branches/cycles/source/blender/editors/space_script/CMakeLists.txt
branches/cycles/source/blender/editors/space_script/script_intern.h
branches/cycles/source/blender/editors/space_sequencer/sequencer_draw.c
branches/cycles/source/blender/editors/space_text/text_header.c
branches/cycles/source/blender/editors/space_text/text_ops.c
branches/cycles/source/blender/editors/space_time/time_intern.h
branches/cycles/source/blender/editors/space_view3d/drawmesh.c
branches/cycles/source/blender/editors/space_view3d/view3d_buttons.c
branches/cycles/source/blender/editors/space_view3d/view3d_draw.c
branches/cycles/source/blender/editors/space_view3d/view3d_edit.c
branches/cycles/source/blender/editors/space_view3d/view3d_snap.c
branches/cycles/source/blender/editors/transform/transform.c
branches/cycles/source/blender/editors/transform/transform_conversions.c
branches/cycles/source/blender/editors/transform/transform_generics.c
branches/cycles/source/blender/editors/transform/transform_ops.c
branches/cycles/source/blender/gpu/GPU_extensions.h
branches/cycles/source/blender/gpu/intern/gpu_extensions.c
branches/cycles/source/blender/gpu/intern/gpu_material.c
branches/cycles/source/blender/ikplugin/CMakeLists.txt
branches/cycles/source/blender/ikplugin/SConscript
branches/cycles/source/blender/imbuf/CMakeLists.txt
branches/cycles/source/blender/imbuf/IMB_imbuf.h
branches/cycles/source/blender/imbuf/intern/allocimbuf.c
branches/cycles/source/blender/imbuf/intern/anim_movie.c
branches/cycles/source/blender/imbuf/intern/readimage.c
branches/cycles/source/blender/makesdna/DNA_mesh_types.h
branches/cycles/source/blender/makesdna/DNA_object_types.h
branches/cycles/source/blender/makesdna/DNA_space_types.h
branches/cycles/source/blender/makesdna/DNA_userdef_types.h
branches/cycles/source/blender/makesdna/DNA_world_types.h
branches/cycles/source/blender/makesdna/intern/makesdna.c
branches/cycles/source/blender/makesrna/intern/CMakeLists.txt
branches/cycles/source/blender/makesrna/intern/makesrna.c
branches/cycles/source/blender/makesrna/intern/rna_action.c
branches/cycles/source/blender/makesrna/intern/rna_context.c
branches/cycles/source/blender/makesrna/intern/rna_fluidsim.c
branches/cycles/source/blender/makesrna/intern/rna_key.c
branches/cycles/source/blender/makesrna/intern/rna_scene.c
branches/cycles/source/blender/makesrna/intern/rna_sequencer.c
branches/cycles/source/blender/makesrna/intern/rna_space.c
branches/cycles/source/blender/makesrna/intern/rna_ui_api.c
branches/cycles/source/blender/makesrna/intern/rna_userdef.c
branches/cycles/source/blender/makesrna/intern/rna_wm.c
branches/cycles/source/blender/makesrna/intern/rna_world.c
branches/cycles/source/blender/modifiers/CMakeLists.txt
branches/cycles/source/blender/modifiers/SConscript
branches/cycles/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/cycles/source/blender/modifiers/intern/MOD_mirror.c
branches/cycles/source/blender/modifiers/intern/MOD_solidify.c
branches/cycles/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/cycles/source/blender/nodes/shader/node_shader_tree.c
branches/cycles/source/blender/nodes/texture/node_texture_tree.c
branches/cycles/source/blender/nodes/texture/nodes/node_texture_scale.c
branches/cycles/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/cycles/source/blender/python/BPY_extern.h
branches/cycles/source/blender/python/generic/IDProp.c
branches/cycles/source/blender/python/generic/bpy_internal_import.c
branches/cycles/source/blender/python/generic/bpy_internal_import.h
branches/cycles/source/blender/python/intern/bpy.c
branches/cycles/source/blender/python/intern/bpy_library.c
branches/cycles/source/blender/python/intern/gpu.c
branches/cycles/source/blender/python/mathutils/mathutils_Quaternion.c
branches/cycles/source/blender/python/mathutils/mathutils_geometry.c
branches/cycles/source/blender/python/simple_enum_gen.py
branches/cycles/source/blender/quicktime/SConscript
branches/cycles/source/blender/windowmanager/intern/wm_event_system.c
branches/cycles/source/blender/windowmanager/intern/wm_operators.c
branches/cycles/source/blender/windowmanager/intern/wm_window.c
branches/cycles/source/blenderplayer/CMakeLists.txt
branches/cycles/source/creator/CMakeLists.txt
branches/cycles/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/cycles/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/cycles/source/gameengine/Converter/CMakeLists.txt
branches/cycles/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/cycles/source/gameengine/Converter/KX_ConvertActuators.h
branches/cycles/source/gameengine/Converter/SConscript
branches/cycles/source/gameengine/GamePlayer/common/GPC_Engine.cpp
branches/cycles/source/gameengine/GamePlayer/common/GPC_Engine.h
branches/cycles/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/cycles/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/cycles/source/gameengine/Ketsji/KX_CameraActuator.h
branches/cycles/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/cycles/source/gameengine/Ketsji/KX_IpoActuator.h
branches/cycles/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/cycles/source/gameengine/Ketsji/KX_PythonInit.h
branches/cycles/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/cycles/source/gameengine/Ketsji/KX_SceneActuator.h
branches/cycles/source/gameengine/VideoTexture/Texture.cpp
branches/cycles/source/gameengine/VideoTexture/Texture.h
branches/cycles/source/tests/check_deprecated.py
Added Paths:
-----------
branches/cycles/extern/Eigen3/
branches/cycles/extern/Eigen3/Eigen/
branches/cycles/extern/Eigen3/Eigen/Array
branches/cycles/extern/Eigen3/Eigen/Cholesky
branches/cycles/extern/Eigen3/Eigen/Core
branches/cycles/extern/Eigen3/Eigen/Dense
branches/cycles/extern/Eigen3/Eigen/Eigen
branches/cycles/extern/Eigen3/Eigen/Eigen2Support
branches/cycles/extern/Eigen3/Eigen/Eigenvalues
branches/cycles/extern/Eigen3/Eigen/Geometry
branches/cycles/extern/Eigen3/Eigen/Householder
branches/cycles/extern/Eigen3/Eigen/Jacobi
branches/cycles/extern/Eigen3/Eigen/LU
branches/cycles/extern/Eigen3/Eigen/LeastSquares
branches/cycles/extern/Eigen3/Eigen/QR
branches/cycles/extern/Eigen3/Eigen/QtAlignedMalloc
branches/cycles/extern/Eigen3/Eigen/SVD
branches/cycles/extern/Eigen3/Eigen/Sparse
branches/cycles/extern/Eigen3/Eigen/StdDeque
branches/cycles/extern/Eigen3/Eigen/StdList
branches/cycles/extern/Eigen3/Eigen/StdVector
branches/cycles/extern/Eigen3/Eigen/src/
branches/cycles/extern/Eigen3/Eigen/src/Cholesky/
branches/cycles/extern/Eigen3/Eigen/src/Cholesky/LDLT.h
branches/cycles/extern/Eigen3/Eigen/src/Cholesky/LLT.h
branches/cycles/extern/Eigen3/Eigen/src/Core/
branches/cycles/extern/Eigen3/Eigen/src/Core/Array.h
branches/cycles/extern/Eigen3/Eigen/src/Core/ArrayBase.h
branches/cycles/extern/Eigen3/Eigen/src/Core/ArrayWrapper.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Assign.h
branches/cycles/extern/Eigen3/Eigen/src/Core/BandMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Block.h
branches/cycles/extern/Eigen3/Eigen/src/Core/BooleanRedux.h
branches/cycles/extern/Eigen3/Eigen/src/Core/CommaInitializer.h
branches/cycles/extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h
branches/cycles/extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h
branches/cycles/extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h
branches/cycles/extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h
branches/cycles/extern/Eigen3/Eigen/src/Core/DenseBase.h
branches/cycles/extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h
branches/cycles/extern/Eigen3/Eigen/src/Core/DenseStorage.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Diagonal.h
branches/cycles/extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Core/DiagonalProduct.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Dot.h
branches/cycles/extern/Eigen3/Eigen/src/Core/EigenBase.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Flagged.h
branches/cycles/extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Functors.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Fuzzy.h
branches/cycles/extern/Eigen3/Eigen/src/Core/GenericPacketMath.h
branches/cycles/extern/Eigen3/Eigen/src/Core/GlobalFunctions.h
branches/cycles/extern/Eigen3/Eigen/src/Core/IO.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Map.h
branches/cycles/extern/Eigen3/Eigen/src/Core/MapBase.h
branches/cycles/extern/Eigen3/Eigen/src/Core/MathFunctions.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Matrix.h
branches/cycles/extern/Eigen3/Eigen/src/Core/MatrixBase.h
branches/cycles/extern/Eigen3/Eigen/src/Core/NestByValue.h
branches/cycles/extern/Eigen3/Eigen/src/Core/NoAlias.h
branches/cycles/extern/Eigen3/Eigen/src/Core/NumTraits.h
branches/cycles/extern/Eigen3/Eigen/src/Core/PermutationMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Core/PlainObjectBase.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Product.h
branches/cycles/extern/Eigen3/Eigen/src/Core/ProductBase.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Random.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Redux.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Replicate.h
branches/cycles/extern/Eigen3/Eigen/src/Core/ReturnByValue.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Reverse.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Select.h
branches/cycles/extern/Eigen3/Eigen/src/Core/SelfAdjointView.h
branches/cycles/extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
branches/cycles/extern/Eigen3/Eigen/src/Core/SolveTriangular.h
branches/cycles/extern/Eigen3/Eigen/src/Core/StableNorm.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Stride.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Swap.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Transpose.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Transpositions.h
branches/cycles/extern/Eigen3/Eigen/src/Core/TriangularMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Core/VectorBlock.h
branches/cycles/extern/Eigen3/Eigen/src/Core/VectorwiseOp.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Visitor.h
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/AltiVec/
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/Default/
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/NEON/
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/SSE/
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/
branches/cycles/extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/Parallelizer.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/
branches/cycles/extern/Eigen3/Eigen/src/Core/util/BlasUtil.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/Constants.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/Macros.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/Memory.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/Meta.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/StaticAssert.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/XprHelper.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Block.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/LU.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Macros.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Memory.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Meta.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Minor.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/QR.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/SVD.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/
branches/cycles/extern/Eigen3/Eigen/src/Geometry/AlignedBox.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/AngleAxis.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/EulerAngles.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/Homogeneous.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/Hyperplane.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/Quaternion.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/Rotation2D.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/RotationBase.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/Scaling.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/Transform.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/Translation.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/Umeyama.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/arch/
branches/cycles/extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
branches/cycles/extern/Eigen3/Eigen/src/Householder/
branches/cycles/extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h
branches/cycles/extern/Eigen3/Eigen/src/Householder/Householder.h
branches/cycles/extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h
branches/cycles/extern/Eigen3/Eigen/src/Jacobi/
branches/cycles/extern/Eigen3/Eigen/src/Jacobi/Jacobi.h
branches/cycles/extern/Eigen3/Eigen/src/LU/
branches/cycles/extern/Eigen3/Eigen/src/LU/Determinant.h
branches/cycles/extern/Eigen3/Eigen/src/LU/FullPivLU.h
branches/cycles/extern/Eigen3/Eigen/src/LU/Inverse.h
branches/cycles/extern/Eigen3/Eigen/src/LU/PartialPivLU.h
branches/cycles/extern/Eigen3/Eigen/src/LU/arch/
branches/cycles/extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h
branches/cycles/extern/Eigen3/Eigen/src/QR/
branches/cycles/extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h
branches/cycles/extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h
branches/cycles/extern/Eigen3/Eigen/src/QR/HouseholderQR.h
branches/cycles/extern/Eigen3/Eigen/src/SVD/
branches/cycles/extern/Eigen3/Eigen/src/SVD/JacobiSVD.h
branches/cycles/extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/
branches/cycles/extern/Eigen3/Eigen/src/Sparse/AmbiVector.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/CompressedStorage.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/CoreIterators.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/MappedSparseMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseAssign.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseBlock.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseDenseProduct.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseDot.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseFuzzy.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseMatrixBase.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseProduct.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseRedux.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseSparseProduct.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseTranspose.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseTriangularView.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseUtil.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseVector.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseView.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/TriangularSolver.h
branches/cycles/extern/Eigen3/Eigen/src/StlSupport/
branches/cycles/extern/Eigen3/Eigen/src/StlSupport/StdDeque.h
branches/cycles/extern/Eigen3/Eigen/src/StlSupport/StdList.h
branches/cycles/extern/Eigen3/Eigen/src/StlSupport/StdVector.h
branches/cycles/extern/Eigen3/Eigen/src/StlSupport/details.h
branches/cycles/extern/Eigen3/Eigen/src/misc/
branches/cycles/extern/Eigen3/Eigen/src/misc/Image.h
branches/cycles/extern/Eigen3/Eigen/src/misc/Kernel.h
branches/cycles/extern/Eigen3/Eigen/src/misc/Solve.h
branches/cycles/extern/Eigen3/Eigen/src/plugins/
branches/cycles/extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
branches/cycles/extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
branches/cycles/extern/Eigen3/Eigen/src/plugins/BlockMethods.h
branches/cycles/extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
branches/cycles/extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
branches/cycles/extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
branches/cycles/extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
branches/cycles/extern/Eigen3/eigen-update.sh
branches/cycles/extern/colamd/
branches/cycles/extern/colamd/CMakeLists.txt
branches/cycles/extern/colamd/Doc/
branches/cycles/extern/colamd/Doc/ChangeLog
branches/cycles/extern/colamd/Doc/lesser.txt
branches/cycles/extern/colamd/Include/
branches/cycles/extern/colamd/Include/UFconfig.h
branches/cycles/extern/colamd/Include/colamd.h
branches/cycles/extern/colamd/README.txt
branches/cycles/extern/colamd/SConscript
branches/cycles/extern/colamd/Source/
branches/cycles/extern/colamd/Source/colamd.c
branches/cycles/extern/colamd/Source/colamd_global.c
branches/cycles/release/bin/blender-softwaregl
branches/cycles/release/datafiles/blender_icons.png
branches/cycles/source/blender/editors/datafiles/blender_icons.png.c
Removed Paths:
-------------
branches/cycles/extern/Eigen2/Eigen/Array
branches/cycles/extern/Eigen2/Eigen/Cholesky
branches/cycles/extern/Eigen2/Eigen/Core
branches/cycles/extern/Eigen2/Eigen/Dense
branches/cycles/extern/Eigen2/Eigen/Eigen
branches/cycles/extern/Eigen2/Eigen/Geometry
branches/cycles/extern/Eigen2/Eigen/LU
branches/cycles/extern/Eigen2/Eigen/LeastSquares
branches/cycles/extern/Eigen2/Eigen/NewStdVector
branches/cycles/extern/Eigen2/Eigen/QR
branches/cycles/extern/Eigen2/Eigen/QtAlignedMalloc
branches/cycles/extern/Eigen2/Eigen/SVD
branches/cycles/extern/Eigen2/Eigen/Sparse
branches/cycles/extern/Eigen2/Eigen/StdVector
branches/cycles/extern/Eigen2/Eigen/src/Array/BooleanRedux.h
branches/cycles/extern/Eigen2/Eigen/src/Array/CwiseOperators.h
branches/cycles/extern/Eigen2/Eigen/src/Array/Functors.h
branches/cycles/extern/Eigen2/Eigen/src/Array/Norms.h
branches/cycles/extern/Eigen2/Eigen/src/Array/PartialRedux.h
branches/cycles/extern/Eigen2/Eigen/src/Array/Random.h
branches/cycles/extern/Eigen2/Eigen/src/Array/Select.h
branches/cycles/extern/Eigen2/Eigen/src/Cholesky/CholeskyInstantiations.cpp
branches/cycles/extern/Eigen2/Eigen/src/Cholesky/LDLT.h
branches/cycles/extern/Eigen2/Eigen/src/Cholesky/LLT.h
branches/cycles/extern/Eigen2/Eigen/src/Core/Assign.h
branches/cycles/extern/Eigen2/Eigen/src/Core/Block.h
branches/cycles/extern/Eigen2/Eigen/src/Core/CacheFriendlyProduct.h
branches/cycles/extern/Eigen2/Eigen/src/Core/Coeffs.h
branches/cycles/extern/Eigen2/Eigen/src/Core/CommaInitializer.h
branches/cycles/extern/Eigen2/Eigen/src/Core/CoreInstantiations.cpp
branches/cycles/extern/Eigen2/Eigen/src/Core/Cwise.h
branches/cycles/extern/Eigen2/Eigen/src/Core/CwiseBinaryOp.h
branches/cycles/extern/Eigen2/Eigen/src/Core/CwiseNullaryOp.h
branches/cycles/extern/Eigen2/Eigen/src/Core/CwiseUnaryOp.h
branches/cycles/extern/Eigen2/Eigen/src/Core/DiagonalCoeffs.h
branches/cycles/extern/Eigen2/Eigen/src/Core/DiagonalMatrix.h
branches/cycles/extern/Eigen2/Eigen/src/Core/DiagonalProduct.h
branches/cycles/extern/Eigen2/Eigen/src/Core/Dot.h
branches/cycles/extern/Eigen2/Eigen/src/Core/Flagged.h
branches/cycles/extern/Eigen2/Eigen/src/Core/Functors.h
branches/cycles/extern/Eigen2/Eigen/src/Core/Fuzzy.h
branches/cycles/extern/Eigen2/Eigen/src/Core/GenericPacketMath.h
branches/cycles/extern/Eigen2/Eigen/src/Core/IO.h
branches/cycles/extern/Eigen2/Eigen/src/Core/Map.h
branches/cycles/extern/Eigen2/Eigen/src/Core/MapBase.h
branches/cycles/extern/Eigen2/Eigen/src/Core/MathFunctions.h
branches/cycles/extern/Eigen2/Eigen/src/Core/Matrix.h
branches/cycles/extern/Eigen2/Eigen/src/Core/MatrixBase.h
branches/cycles/extern/Eigen2/Eigen/src/Core/MatrixStorage.h
branches/cycles/extern/Eigen2/Eigen/src/Core/Minor.h
branches/cycles/extern/Eigen2/Eigen/src/Core/NestByValue.h
branches/cycles/extern/Eigen2/Eigen/src/Core/NumTraits.h
branches/cycles/extern/Eigen2/Eigen/src/Core/Part.h
branches/cycles/extern/Eigen2/Eigen/src/Core/Product.h
branches/cycles/extern/Eigen2/Eigen/src/Core/Redux.h
branches/cycles/extern/Eigen2/Eigen/src/Core/SolveTriangular.h
branches/cycles/extern/Eigen2/Eigen/src/Core/Sum.h
branches/cycles/extern/Eigen2/Eigen/src/Core/Swap.h
branches/cycles/extern/Eigen2/Eigen/src/Core/Transpose.h
branches/cycles/extern/Eigen2/Eigen/src/Core/Visitor.h
branches/cycles/extern/Eigen2/Eigen/src/Core/arch/AltiVec/PacketMath.h
branches/cycles/extern/Eigen2/Eigen/src/Core/arch/SSE/PacketMath.h
branches/cycles/extern/Eigen2/Eigen/src/Core/util/Constants.h
branches/cycles/extern/Eigen2/Eigen/src/Core/util/DisableMSVCWarnings.h
branches/cycles/extern/Eigen2/Eigen/src/Core/util/EnableMSVCWarnings.h
branches/cycles/extern/Eigen2/Eigen/src/Core/util/ForwardDeclarations.h
branches/cycles/extern/Eigen2/Eigen/src/Core/util/Macros.h
branches/cycles/extern/Eigen2/Eigen/src/Core/util/Memory.h
branches/cycles/extern/Eigen2/Eigen/src/Core/util/Meta.h
branches/cycles/extern/Eigen2/Eigen/src/Core/util/StaticAssert.h
branches/cycles/extern/Eigen2/Eigen/src/Core/util/XprHelper.h
branches/cycles/extern/Eigen2/Eigen/src/Geometry/AlignedBox.h
branches/cycles/extern/Eigen2/Eigen/src/Geometry/AngleAxis.h
branches/cycles/extern/Eigen2/Eigen/src/Geometry/EulerAngles.h
branches/cycles/extern/Eigen2/Eigen/src/Geometry/Hyperplane.h
branches/cycles/extern/Eigen2/Eigen/src/Geometry/OrthoMethods.h
branches/cycles/extern/Eigen2/Eigen/src/Geometry/ParametrizedLine.h
branches/cycles/extern/Eigen2/Eigen/src/Geometry/Quaternion.h
branches/cycles/extern/Eigen2/Eigen/src/Geometry/Rotation2D.h
branches/cycles/extern/Eigen2/Eigen/src/Geometry/RotationBase.h
branches/cycles/extern/Eigen2/Eigen/src/Geometry/Scaling.h
branches/cycles/extern/Eigen2/Eigen/src/Geometry/Transform.h
branches/cycles/extern/Eigen2/Eigen/src/Geometry/Translation.h
branches/cycles/extern/Eigen2/Eigen/src/LU/Determinant.h
branches/cycles/extern/Eigen2/Eigen/src/LU/Inverse.h
branches/cycles/extern/Eigen2/Eigen/src/LU/LU.h
branches/cycles/extern/Eigen2/Eigen/src/LeastSquares/LeastSquares.h
branches/cycles/extern/Eigen2/Eigen/src/QR/EigenSolver.h
branches/cycles/extern/Eigen2/Eigen/src/QR/HessenbergDecomposition.h
branches/cycles/extern/Eigen2/Eigen/src/QR/QR.h
branches/cycles/extern/Eigen2/Eigen/src/QR/QrInstantiations.cpp
branches/cycles/extern/Eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h
branches/cycles/extern/Eigen2/Eigen/src/QR/Tridiagonalization.h
branches/cycles/extern/Eigen2/Eigen/src/SVD/SVD.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/AmbiVector.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/CholmodSupport.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/CompressedStorage.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/CoreIterators.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/MappedSparseMatrix.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/RandomSetter.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseAssign.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseBlock.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseCwise.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseDot.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseFlagged.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseFuzzy.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseLDLT.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseLLT.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseLU.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseMatrix.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseMatrixBase.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseProduct.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseRedux.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseTranspose.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseUtil.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SparseVector.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/SuperLUSupport.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/TaucsSupport.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/TriangularSolver.h
branches/cycles/extern/Eigen2/Eigen/src/Sparse/UmfPackSupport.h
branches/cycles/extern/Eigen2/eigen-update.sh
branches/cycles/extern/Eigen3/Eigen/
branches/cycles/extern/Eigen3/Eigen/Array
branches/cycles/extern/Eigen3/Eigen/Cholesky
branches/cycles/extern/Eigen3/Eigen/Core
branches/cycles/extern/Eigen3/Eigen/Dense
branches/cycles/extern/Eigen3/Eigen/Eigen
branches/cycles/extern/Eigen3/Eigen/Eigen2Support
branches/cycles/extern/Eigen3/Eigen/Eigenvalues
branches/cycles/extern/Eigen3/Eigen/Geometry
branches/cycles/extern/Eigen3/Eigen/Householder
branches/cycles/extern/Eigen3/Eigen/Jacobi
branches/cycles/extern/Eigen3/Eigen/LU
branches/cycles/extern/Eigen3/Eigen/LeastSquares
branches/cycles/extern/Eigen3/Eigen/QR
branches/cycles/extern/Eigen3/Eigen/QtAlignedMalloc
branches/cycles/extern/Eigen3/Eigen/SVD
branches/cycles/extern/Eigen3/Eigen/Sparse
branches/cycles/extern/Eigen3/Eigen/StdDeque
branches/cycles/extern/Eigen3/Eigen/StdList
branches/cycles/extern/Eigen3/Eigen/StdVector
branches/cycles/extern/Eigen3/Eigen/src/
branches/cycles/extern/Eigen3/Eigen/src/Cholesky/
branches/cycles/extern/Eigen3/Eigen/src/Cholesky/LDLT.h
branches/cycles/extern/Eigen3/Eigen/src/Cholesky/LLT.h
branches/cycles/extern/Eigen3/Eigen/src/Core/
branches/cycles/extern/Eigen3/Eigen/src/Core/Array.h
branches/cycles/extern/Eigen3/Eigen/src/Core/ArrayBase.h
branches/cycles/extern/Eigen3/Eigen/src/Core/ArrayWrapper.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Assign.h
branches/cycles/extern/Eigen3/Eigen/src/Core/BandMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Block.h
branches/cycles/extern/Eigen3/Eigen/src/Core/BooleanRedux.h
branches/cycles/extern/Eigen3/Eigen/src/Core/CommaInitializer.h
branches/cycles/extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h
branches/cycles/extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h
branches/cycles/extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h
branches/cycles/extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h
branches/cycles/extern/Eigen3/Eigen/src/Core/DenseBase.h
branches/cycles/extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h
branches/cycles/extern/Eigen3/Eigen/src/Core/DenseStorage.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Diagonal.h
branches/cycles/extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Core/DiagonalProduct.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Dot.h
branches/cycles/extern/Eigen3/Eigen/src/Core/EigenBase.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Flagged.h
branches/cycles/extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Functors.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Fuzzy.h
branches/cycles/extern/Eigen3/Eigen/src/Core/GenericPacketMath.h
branches/cycles/extern/Eigen3/Eigen/src/Core/GlobalFunctions.h
branches/cycles/extern/Eigen3/Eigen/src/Core/IO.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Map.h
branches/cycles/extern/Eigen3/Eigen/src/Core/MapBase.h
branches/cycles/extern/Eigen3/Eigen/src/Core/MathFunctions.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Matrix.h
branches/cycles/extern/Eigen3/Eigen/src/Core/MatrixBase.h
branches/cycles/extern/Eigen3/Eigen/src/Core/NestByValue.h
branches/cycles/extern/Eigen3/Eigen/src/Core/NoAlias.h
branches/cycles/extern/Eigen3/Eigen/src/Core/NumTraits.h
branches/cycles/extern/Eigen3/Eigen/src/Core/PermutationMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Core/PlainObjectBase.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Product.h
branches/cycles/extern/Eigen3/Eigen/src/Core/ProductBase.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Random.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Redux.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Replicate.h
branches/cycles/extern/Eigen3/Eigen/src/Core/ReturnByValue.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Reverse.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Select.h
branches/cycles/extern/Eigen3/Eigen/src/Core/SelfAdjointView.h
branches/cycles/extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
branches/cycles/extern/Eigen3/Eigen/src/Core/SolveTriangular.h
branches/cycles/extern/Eigen3/Eigen/src/Core/StableNorm.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Stride.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Swap.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Transpose.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Transpositions.h
branches/cycles/extern/Eigen3/Eigen/src/Core/TriangularMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Core/VectorBlock.h
branches/cycles/extern/Eigen3/Eigen/src/Core/VectorwiseOp.h
branches/cycles/extern/Eigen3/Eigen/src/Core/Visitor.h
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/AltiVec/
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/Default/
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/NEON/
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/SSE/
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h
branches/cycles/extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/
branches/cycles/extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/Parallelizer.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/
branches/cycles/extern/Eigen3/Eigen/src/Core/util/BlasUtil.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/Constants.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/Macros.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/Memory.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/Meta.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/StaticAssert.h
branches/cycles/extern/Eigen3/Eigen/src/Core/util/XprHelper.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Block.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/LU.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Macros.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Memory.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Meta.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/Minor.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/QR.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/SVD.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
branches/cycles/extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/EigenvaluesCommon.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
branches/cycles/extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/
branches/cycles/extern/Eigen3/Eigen/src/Geometry/AlignedBox.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/AngleAxis.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/EulerAngles.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/Homogeneous.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/Hyperplane.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/Quaternion.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/Rotation2D.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/RotationBase.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/Scaling.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/Transform.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/Translation.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/Umeyama.h
branches/cycles/extern/Eigen3/Eigen/src/Geometry/arch/
branches/cycles/extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
branches/cycles/extern/Eigen3/Eigen/src/Householder/
branches/cycles/extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h
branches/cycles/extern/Eigen3/Eigen/src/Householder/Householder.h
branches/cycles/extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h
branches/cycles/extern/Eigen3/Eigen/src/Jacobi/
branches/cycles/extern/Eigen3/Eigen/src/Jacobi/Jacobi.h
branches/cycles/extern/Eigen3/Eigen/src/LU/
branches/cycles/extern/Eigen3/Eigen/src/LU/Determinant.h
branches/cycles/extern/Eigen3/Eigen/src/LU/FullPivLU.h
branches/cycles/extern/Eigen3/Eigen/src/LU/Inverse.h
branches/cycles/extern/Eigen3/Eigen/src/LU/PartialPivLU.h
branches/cycles/extern/Eigen3/Eigen/src/LU/arch/
branches/cycles/extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h
branches/cycles/extern/Eigen3/Eigen/src/QR/
branches/cycles/extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h
branches/cycles/extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h
branches/cycles/extern/Eigen3/Eigen/src/QR/HouseholderQR.h
branches/cycles/extern/Eigen3/Eigen/src/SVD/
branches/cycles/extern/Eigen3/Eigen/src/SVD/JacobiSVD.h
branches/cycles/extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/
branches/cycles/extern/Eigen3/Eigen/src/Sparse/AmbiVector.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/CompressedStorage.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/CoreIterators.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/DynamicSparseMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/MappedSparseMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseAssign.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseBlock.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseCwiseBinaryOp.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseCwiseUnaryOp.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseDenseProduct.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseDiagonalProduct.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseDot.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseFuzzy.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseMatrix.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseMatrixBase.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseProduct.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseRedux.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseSelfAdjointView.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseSparseProduct.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseTranspose.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseTriangularView.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseUtil.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseVector.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/SparseView.h
branches/cycles/extern/Eigen3/Eigen/src/Sparse/TriangularSolver.h
branches/cycles/extern/Eigen3/Eigen/src/StlSupport/
branches/cycles/extern/Eigen3/Eigen/src/StlSupport/StdDeque.h
branches/cycles/extern/Eigen3/Eigen/src/StlSupport/StdList.h
branches/cycles/extern/Eigen3/Eigen/src/StlSupport/StdVector.h
branches/cycles/extern/Eigen3/Eigen/src/StlSupport/details.h
branches/cycles/extern/Eigen3/Eigen/src/misc/
branches/cycles/extern/Eigen3/Eigen/src/misc/Image.h
branches/cycles/extern/Eigen3/Eigen/src/misc/Kernel.h
branches/cycles/extern/Eigen3/Eigen/src/misc/Solve.h
branches/cycles/extern/Eigen3/Eigen/src/plugins/
branches/cycles/extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
branches/cycles/extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
branches/cycles/extern/Eigen3/Eigen/src/plugins/BlockMethods.h
branches/cycles/extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
branches/cycles/extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
branches/cycles/extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
branches/cycles/extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
branches/cycles/extern/Eigen3/eigen-update.sh
branches/cycles/extern/colamd/CMakeLists.txt
branches/cycles/extern/colamd/Doc/
branches/cycles/extern/colamd/Doc/ChangeLog
branches/cycles/extern/colamd/Doc/lesser.txt
branches/cycles/extern/colamd/Include/
branches/cycles/extern/colamd/Include/UFconfig.h
branches/cycles/extern/colamd/Include/colamd.h
branches/cycles/extern/colamd/README.txt
branches/cycles/extern/colamd/SConscript
branches/cycles/extern/colamd/Source/
branches/cycles/extern/colamd/Source/colamd.c
branches/cycles/extern/colamd/Source/colamd_global.c
branches/cycles/intern/opennl/superlu/colamd.c
branches/cycles/intern/opennl/superlu/colamd.h
branches/cycles/release/datafiles/blenderbuttons
branches/cycles/source/blender/editors/datafiles/blenderbuttons.c
branches/cycles/source/blender/editors/space_script/script_header.c
branches/cycles/source/blender/editors/space_sound/
Property Changed:
----------------
branches/cycles/
branches/cycles/intern/
branches/cycles/release/
branches/cycles/source/blender/editors/datafiles/startup.blend.c
branches/cycles/source/blender/editors/render/render_update.c
branches/cycles/source/blender/editors/space_outliner/
branches/cycles/source/blender/editors/uvedit/uvedit_buttons.c
branches/cycles/source/blender/python/intern/
Property changes on: branches/cycles
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk:37695-37700
/trunk/blender:36353-40411,40935-41266
+ /trunk:37695-37700
/trunk/blender:36353-40411,40935-41467
Modified: branches/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/CMakeLists.txt 2011-11-02 16:02:01 UTC (rev 41470)
+++ branches/cycles/CMakeLists.txt 2011-11-02 16:17:05 UTC (rev 41471)
@@ -61,6 +61,13 @@
# quiet output for Makefiles, 'make -s' helps too
# set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
+# global compile definitions since add_definitions() adds for all.
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG _DEBUG)
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE NDEBUG)
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_MINSIZEREL NDEBUG)
+set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELWITHDEBINFO NDEBUG)
+
+
#-----------------------------------------------------------------------------
# Set policy
@@ -149,7 +156,7 @@
endif()
if(UNIX AND NOT APPLE)
- option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support)" ON)
+ option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON)
option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
else()
# not an option for other OS's
@@ -315,6 +322,9 @@
set(C_WARNINGS)
set(CXX_WARNINGS)
+# for gcc -Wno-blah-blah
+set(CC_REMOVE_STRICT_FLAGS)
+
# libraries to link the binary with passed to target_link_libraries()
# known as LLIBS to scons
set(PLATFORM_LINKLIBS "")
@@ -564,8 +574,8 @@
set(PLATFORM_LINKFLAGS "-pthread")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE")
+ # lfs on glibc, all compilers should use
+ add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
# GNU Compiler
if(CMAKE_COMPILER_IS_GNUCC)
@@ -673,21 +683,21 @@
set(CMAKE_C_FLAGS "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
if(CMAKE_CL_64)
- set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
else()
- set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
endif()
- set(CMAKE_CXX_FLAGS_RELEASE "/O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
- set(CMAKE_CXX_FLAGS_MINSIZEREL "/O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_RELEASE "/O2 /Ob2 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_MINSIZEREL "/O1 /Ob1 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
if(CMAKE_CL_64)
- set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
else()
- set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
endif()
- set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
- set(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
if(WITH_INTERNATIONAL)
set(GETTEXT ${LIBDIR}/gettext)
@@ -872,9 +882,6 @@
add_definitions(-DFREE_WINDOWS)
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
-
if(WITH_INTERNATIONAL)
set(GETTEXT ${LIBDIR}/gcc/gettext)
set(GETTEXT_INCLUDE_DIRS ${GETTEXT}/include)
@@ -1343,21 +1350,6 @@
#-----------------------------------------------------------------------------
# Extra compile flags
-if((NOT WIN32) AND (NOT MSVC))
- # used for internal debug checks
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG")
-
- # assert() checks for this.
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
- set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -DNDEBUG")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DNDEBUG")
-
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG")
- set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -DNDEBUG")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DNDEBUG")
-endif()
-
if(CMAKE_COMPILER_IS_GNUCC)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
@@ -1387,6 +1379,11 @@
# # this causes too many warnings, disable
# ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEFINED -Wundef)
+ # flags to undo strict flags
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
+ ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_BUT_SET_VARIABLE -Wno-unused-but-set-variable)
+
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
Modified: branches/cycles/GNUmakefile
===================================================================
--- branches/cycles/GNUmakefile 2011-11-02 16:02:01 UTC (rev 41470)
+++ branches/cycles/GNUmakefile 2011-11-02 16:17:05 UTC (rev 41471)
@@ -1,6 +1,5 @@
# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
-# vim: tabstop=8
-# $Id: GNUmakefile 41122 2011-10-19 21:55:27Z campbellbarton $
+# vim: tabstop=4
#
# ##### BEGIN GPL LICENSE BLOCK #####
#
Modified: branches/cycles/SConstruct
===================================================================
--- branches/cycles/SConstruct 2011-11-02 16:02:01 UTC (rev 41470)
+++ branches/cycles/SConstruct 2011-11-02 16:17:05 UTC (rev 41471)
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-# $Id: SConstruct 41169 2011-10-21 04:23:26Z campbellbarton $
+#
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
@@ -30,6 +30,8 @@
# Then read all SConscripts and build
#
# TODO: fix /FORCE:MULTIPLE on windows to get proper debug builds.
+# TODO: directory copy functions are far too complicated, see:
+# http://wiki.blender.org/index.php/User:Ideasman42/SConsNotSimpleInstallingFiles
import platform as pltfrm
@@ -251,7 +253,9 @@
target_env_defs['WITH_BF_BULLET'] = False
target_env_defs['WITH_BF_BINRELOC'] = False
target_env_defs['BF_BUILDINFO'] = False
- target_env_defs['BF_NO_ELBEEM'] = True
+ target_env_defs['WITH_BF_FLUID'] = False
+ target_env_defs['WITH_BF_DECIMATE'] = False
+ target_env_defs['WITH_BF_BOOLEAN'] = False
target_env_defs['WITH_BF_PYTHON'] = False
target_env_defs['WITH_BF_3DMOUSE'] = False
@@ -321,9 +325,9 @@
if 'blendernogame' in B.targets:
env['WITH_BF_GAMEENGINE'] = False
-# disable elbeem (fluidsim) compilation?
-if env['BF_NO_ELBEEM'] == 1:
- env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
+# build without elbeem (fluidsim)?
+if env['WITH_BF_FLUID'] == 1:
+ env['CPPFLAGS'].append('-DWITH_MOD_FLUID')
if btools.ENDIAN == "big":
Modified: branches/cycles/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/cycles/build_files/cmake/cmake_consistency_check.py 2011-11-02 16:02:01 UTC (rev 41470)
+++ branches/cycles/build_files/cmake/cmake_consistency_check.py 2011-11-02 16:17:05 UTC (rev 41471)
@@ -74,7 +74,7 @@
def is_c(filename):
ext = splitext(filename)[1]
- return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc"))
+ return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc", ".inl"))
def is_c_any(filename):
Modified: branches/cycles/build_files/cmake/cmake_consistency_check_config.py
===================================================================
--- branches/cycles/build_files/cmake/cmake_consistency_check_config.py 2011-11-02 16:02:01 UTC (rev 41470)
+++ branches/cycles/build_files/cmake/cmake_consistency_check_config.py 2011-11-02 16:17:05 UTC (rev 41471)
@@ -29,8 +29,8 @@
"source/blender/imbuf/intern/imbuf_cocoa.m",
"extern/recastnavigation/Recast/Source/RecastLog.cpp",
"extern/recastnavigation/Recast/Source/RecastTimer.cpp",
- "entern/audaspace/SRC/AUD_SRCResampleFactory.cpp",
- "entern/audaspace/SRC/AUD_SRCResampleReader.cpp",
+ "intern/audaspace/SRC/AUD_SRCResampleFactory.cpp",
+ "intern/audaspace/SRC/AUD_SRCResampleReader.cpp",
"extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h",
"extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h",
@@ -44,7 +44,7 @@
"extern/eltopo/common/meshes/ObjLoader.hpp",
"extern/eltopo/common/meshes/TriangleIndex.hpp",
"extern/eltopo/common/meshes/meshloader.h",
- "extern/eltopo/eltopo3d/broadphase_blenderbvh.h"
+ "extern/eltopo/eltopo3d/broadphase_blenderbvh.h",
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list