[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46561] branches/meshdata_transfer: svn merge ^/trunk/blender -r46463:HEAD

Ove Murberg Henriksen sorayasilvermoon at hotmail.com
Fri May 11 21:26:43 CEST 2012


Revision: 46561
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46561
Author:   cyborgmuppet
Date:     2012-05-11 19:26:43 +0000 (Fri, 11 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46463:HEAD

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46463

Modified Paths:
--------------
    branches/meshdata_transfer/CMakeLists.txt
    branches/meshdata_transfer/build_files/scons/config/win64-mingw-config.py
    branches/meshdata_transfer/extern/carve/CMakeLists.txt
    branches/meshdata_transfer/extern/carve/bundle.sh
    branches/meshdata_transfer/extern/carve/lib/intersect.cpp
    branches/meshdata_transfer/extern/libmv/ChangeLog
    branches/meshdata_transfer/extern/libmv/bundle.sh
    branches/meshdata_transfer/extern/libmv/libmv/image/convolve.cc
    branches/meshdata_transfer/extern/libmv/libmv/image/convolve.h
    branches/meshdata_transfer/intern/cycles/render/image.cpp
    branches/meshdata_transfer/intern/cycles/util/util_task.cpp
    branches/meshdata_transfer/intern/cycles/util/util_task.h
    branches/meshdata_transfer/intern/dualcon/intern/Projections.cpp
    branches/meshdata_transfer/intern/dualcon/intern/Projections.h
    branches/meshdata_transfer/intern/dualcon/intern/octree.cpp
    branches/meshdata_transfer/intern/dualcon/intern/octree.h
    branches/meshdata_transfer/intern/ghost/CMakeLists.txt
    branches/meshdata_transfer/release/scripts/modules/bpy_types.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/space_console.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/space_sequencer.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/space_view3d.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/meshdata_transfer/source/blender/blenfont/BLF_api.h
    branches/meshdata_transfer/source/blender/blenfont/intern/blf_dir.c
    branches/meshdata_transfer/source/blender/blenfont/intern/blf_font.c
    branches/meshdata_transfer/source/blender/blenfont/intern/blf_glyph.c
    branches/meshdata_transfer/source/blender/blenfont/intern/blf_lang.c
    branches/meshdata_transfer/source/blender/blenfont/intern/blf_translation.c
    branches/meshdata_transfer/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_blender.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_modifier.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_multires.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_node.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_paint.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_sequencer.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_sound.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_subsurf.h
    branches/meshdata_transfer/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/CCGSubSurf.h
    branches/meshdata_transfer/source/blender/blenkernel/intern/DerivedMesh.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/customdata.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/displist.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/lattice.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/multires.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/paint.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/scene.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/sequencer.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/shrinkwrap.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/sound.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/tracking.c
    branches/meshdata_transfer/source/blender/blenlib/BLI_pbvh.h
    branches/meshdata_transfer/source/blender/blenlib/intern/pbvh.c
    branches/meshdata_transfer/source/blender/blenloader/intern/readfile.c
    branches/meshdata_transfer/source/blender/blenloader/intern/writefile.c
    branches/meshdata_transfer/source/blender/collada/MaterialExporter.cpp
    branches/meshdata_transfer/source/blender/editors/animation/anim_deps.c
    branches/meshdata_transfer/source/blender/editors/animation/anim_filter.c
    branches/meshdata_transfer/source/blender/editors/datafiles/CMakeLists.txt
    branches/meshdata_transfer/source/blender/editors/include/ED_datafiles.h
    branches/meshdata_transfer/source/blender/editors/include/ED_sculpt.h
    branches/meshdata_transfer/source/blender/editors/include/UI_icons.h
    branches/meshdata_transfer/source/blender/editors/interface/interface_handlers.c
    branches/meshdata_transfer/source/blender/editors/interface/interface_icons.c
    branches/meshdata_transfer/source/blender/editors/interface/interface_layout.c
    branches/meshdata_transfer/source/blender/editors/interface/interface_ops.c
    branches/meshdata_transfer/source/blender/editors/mesh/editmesh_loopcut.c
    branches/meshdata_transfer/source/blender/editors/object/object_bake.c
    branches/meshdata_transfer/source/blender/editors/object/object_modifier.c
    branches/meshdata_transfer/source/blender/editors/object/object_vgroup.c
    branches/meshdata_transfer/source/blender/editors/render/render_shading.c
    branches/meshdata_transfer/source/blender/editors/screen/screen_context.c
    branches/meshdata_transfer/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_hide.c
    branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_intern.h
    branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_ops.c
    branches/meshdata_transfer/source/blender/editors/sculpt_paint/sculpt.c
    branches/meshdata_transfer/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/meshdata_transfer/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/meshdata_transfer/source/blender/editors/space_clip/clip_editor.c
    branches/meshdata_transfer/source/blender/editors/space_console/console_intern.h
    branches/meshdata_transfer/source/blender/editors/space_console/console_ops.c
    branches/meshdata_transfer/source/blender/editors/space_console/space_console.c
    branches/meshdata_transfer/source/blender/editors/space_file/fsmenu.c
    branches/meshdata_transfer/source/blender/editors/space_node/drawnode.c
    branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_select.c
    branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_tree.c
    branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_add.c
    branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_select.c
    branches/meshdata_transfer/source/blender/editors/space_view3d/drawmesh.c
    branches/meshdata_transfer/source/blender/editors/space_view3d/drawobject.c
    branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_intern.h
    branches/meshdata_transfer/source/blender/editors/transform/transform_conversions.c
    branches/meshdata_transfer/source/blender/editors/util/crazyspace.c
    branches/meshdata_transfer/source/blender/editors/util/numinput.c
    branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/meshdata_transfer/source/blender/gpu/GPU_buffers.h
    branches/meshdata_transfer/source/blender/gpu/intern/gpu_buffers.c
    branches/meshdata_transfer/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/meshdata_transfer/source/blender/imbuf/intern/png.c
    branches/meshdata_transfer/source/blender/makesdna/DNA_brush_types.h
    branches/meshdata_transfer/source/blender/makesdna/DNA_customdata_types.h
    branches/meshdata_transfer/source/blender/makesdna/DNA_meshdata_types.h
    branches/meshdata_transfer/source/blender/makesdna/DNA_node_types.h
    branches/meshdata_transfer/source/blender/makesrna/RNA_access.h
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_access.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_brush.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_internal.h
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_nodetree.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_scene.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_sequencer.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_armature.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_array.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_bevel.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_boolean.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_build.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_cast.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_cloth.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_collision.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_curve.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_decimate.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_displace.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_dynamicpaint.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_explode.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_fluidsim.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_hook.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_lattice.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_mask.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_mirror.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_multires.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_ocean.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_particlesystem.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_remesh.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_screw.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_shapekey.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_shrinkwrap.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_smoke.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_smooth.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_softbody.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_solidify.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_subsurf.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_surface.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_uvproject.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_warp.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_wave.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/meshdata_transfer/source/blender/python/intern/bpy_rna.c
    branches/meshdata_transfer/source/blender/windowmanager/intern/wm_window.c
    branches/meshdata_transfer/source/creator/CMakeLists.txt
    branches/meshdata_transfer/source/creator/creator.c

Added Paths:
-----------
    branches/meshdata_transfer/release/datafiles/brushicons/mask.png
    branches/meshdata_transfer/source/blender/blenkernel/BKE_ccg.h
    branches/meshdata_transfer/source/blender/editors/datafiles/mask.png.c
    branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_mask.c

Property Changed:
----------------
    branches/meshdata_transfer/
    branches/meshdata_transfer/source/blender/editors/interface/interface.c
    branches/meshdata_transfer/source/blender/editors/space_outliner/


Property changes on: branches/meshdata_transfer
___________________________________________________________________
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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46463
   + /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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46559

Modified: branches/meshdata_transfer/CMakeLists.txt
===================================================================
--- branches/meshdata_transfer/CMakeLists.txt	2012-05-11 18:55:14 UTC (rev 46560)
+++ branches/meshdata_transfer/CMakeLists.txt	2012-05-11 19:26:43 UTC (rev 46561)
@@ -195,7 +195,6 @@
 
 # Audio/Video format support
 option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
-unset(PLATFORM_DEFAULT)
 
 option(WITH_CODEC_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
 if(APPLE OR (WIN32 AND NOT UNIX))
@@ -372,7 +371,7 @@
 		                    "line if youre a developer who wants to add support.")
 	endif()
 	
-	if((WITH_MINGW64) AND (WITH_OPENCOLLADA OR WITH_CODEC_FFMPEG))
+	if((WITH_MINGW64) AND (WITH_OPENCOLLADA))
 		message(FATAL_ERROR "MINGW64 still doesn't support: WITH_OPENCOLLADA/WITH_CODEC_FFMPEG")
 	endif()
 endif()
@@ -1089,7 +1088,11 @@
 		if(WITH_CODEC_FFMPEG)
 			set(FFMPEG ${LIBDIR}/ffmpeg)
 			set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include)
-			set(FFMPEG_LIBRARIES avcodec-53 avformat-53 avdevice-53 avutil-51 swscale-2)
+			if(WITH_MINGW64)
+				set(FFMPEG_LIBRARIES avcodec.dll avformat.dll avdevice.dll avutil.dll swscale.dll swresample.dll)
+			else()
+				set(FFMPEG_LIBRARIES avcodec-53 avformat-53 avdevice-53 avutil-51 swscale-2)
+			endif()
 			set(FFMPEG_LIBPATH ${FFMPEG}/lib)
 		endif()
 

Modified: branches/meshdata_transfer/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/meshdata_transfer/build_files/scons/config/win64-mingw-config.py	2012-05-11 18:55:14 UTC (rev 46560)
+++ branches/meshdata_transfer/build_files/scons/config/win64-mingw-config.py	2012-05-11 19:26:43 UTC (rev 46561)
@@ -16,11 +16,11 @@
 BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
-WITH_BF_FFMPEG = False # TODO: FFmpeg gives linking errors, need to compile with MinGW-w64?
-BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
+WITH_BF_FFMPEG = True
+BF_FFMPEG_LIB = 'avformat.dll avcodec.dll avdevice.dll avutil.dll swscale.dll swresample.dll'
 BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib'
 BF_FFMPEG_INC =  LIBDIR + '/ffmpeg/include'
-BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
+BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll ${BF_FFMPEG_LIBPATH}/swresample-0.dll ${BF_FFMPEG_LIBPATH}/xvidcore.dll'
 
 WITH_BF_JACK = False
 BF_JACK = LIBDIR + '/jack'
@@ -137,14 +137,14 @@
              '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
              '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
 
-WITH_BF_COLLADA = False # TODO: Compile Collada with MinGW-w64
+WITH_BF_COLLADA = True
 BF_COLLADA = '#source/blender/collada'
 BF_COLLADA_INC = '${BF_COLLADA}'
 BF_COLLADA_LIB = 'bf_collada'
 
 BF_OPENCOLLADA = LIBDIR + '/opencollada'
 BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml'
 BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 
 #Cycles

Modified: branches/meshdata_transfer/extern/carve/CMakeLists.txt
===================================================================
--- branches/meshdata_transfer/extern/carve/CMakeLists.txt	2012-05-11 18:55:14 UTC (rev 46560)
+++ branches/meshdata_transfer/extern/carve/CMakeLists.txt	2012-05-11 19:26:43 UTC (rev 46561)
@@ -35,115 +35,115 @@
 )
 
 set(SRC
-	lib/intersection.cpp
-	lib/intersect.cpp
-	lib/triangulator.cpp
+	lib/aabb.cpp
+	lib/carve.cpp
 	lib/convex_hull.cpp
-	lib/polyhedron.cpp
-	lib/polyline.cpp
-	lib/pointset.cpp
+	lib/csg_collector.cpp
+	lib/csg.cpp
+	lib/edge.cpp
+	lib/face.cpp
 	lib/geom2d.cpp
-	lib/math.cpp
-	lib/intersect_half_classify_group.cpp
-	lib/intersect_face_division.cpp
-	lib/tag.cpp
-	lib/aabb.cpp
-	lib/intersect_classify_group.cpp
-	lib/mesh.cpp
-	lib/timing.cpp
 	lib/geom3d.cpp
-	lib/intersect_group.cpp
-	lib/carve.cpp
 	lib/intersect_classify_edge.cpp
-	lib/csg.cpp
-	lib/face.cpp
-	lib/csg_collector.cpp
+	lib/intersect_classify_group.cpp
+	lib/intersect.cpp
 	lib/intersect_debug.cpp
-	lib/edge.cpp
+	lib/intersect_face_division.cpp
+	lib/intersect_group.cpp
+	lib/intersect_half_classify_group.cpp
+	lib/intersection.cpp
+	lib/math.cpp
+	lib/mesh.cpp
 	lib/octree.cpp
+	lib/pointset.cpp
+	lib/polyhedron.cpp
+	lib/polyline.cpp
+	lib/tag.cpp
+	lib/timing.cpp
+	lib/triangulator.cpp
 
-	lib/intersect_debug.hpp
 	lib/csg_collector.hpp
 	lib/csg_data.hpp
+	lib/csg_detail.hpp
 	lib/intersect_classify_common.hpp
+	lib/intersect_classify_common_impl.hpp
 	lib/intersect_common.hpp
-	lib/csg_detail.hpp
-	lib/intersect_classify_common_impl.hpp
+	lib/intersect_debug.hpp
 
-	include/carve/vertex_impl.hpp
+	include/carve/aabb.hpp
 	include/carve/aabb_impl.hpp
-	include/carve/csg.hpp
-	include/carve/pointset_iter.hpp
-	include/carve/debug_hooks.hpp
-	include/carve/mesh.hpp
-	include/carve/triangulator_impl.hpp
-	include/carve/edge_decl.hpp
+	include/carve/carve.hpp
+	include/carve/cbrt.h
+	include/carve/classification.hpp
+	include/carve/collection.hpp
+	include/carve/collection_types.hpp
+	include/carve/collection/unordered/boost_impl.hpp
+	include/carve/collection/unordered/fallback_impl.hpp
 	include/carve/collection/unordered.hpp
+	include/carve/collection/unordered/libstdcpp_impl.hpp
+	include/carve/collection/unordered/std_impl.hpp
 	include/carve/collection/unordered/tr1_impl.hpp
-	include/carve/collection/unordered/fallback_impl.hpp
-	include/carve/collection/unordered/std_impl.hpp
 	include/carve/collection/unordered/vcpp_impl.hpp
-	include/carve/collection/unordered/libstdcpp_impl.hpp
-	include/carve/collection/unordered/boost_impl.hpp
+	include/carve/colour.hpp
 	include/carve/convex_hull.hpp
-	include/carve/geom.hpp
-	include/carve/collection_types.hpp
-	include/carve/cbrt.h
-	include/carve/util.hpp
-	include/carve/iobj.hpp
-	include/carve/polyline_decl.hpp
-	include/carve/polyline_impl.hpp
-	include/carve/win32.h
+	include/carve/csg.hpp
+	include/carve/csg_triangulator.hpp
+	include/carve/debug_hooks.hpp
+	include/carve/djset.hpp
+	include/carve/edge_decl.hpp
 	include/carve/edge_impl.hpp
-	include/carve/carve.hpp
-	include/carve/polyline.hpp
+	include/carve/exact.hpp
 	include/carve/face_decl.hpp
-	include/carve/matrix.hpp
-	include/carve/classification.hpp
-	include/carve/geom_impl.hpp
+	include/carve/face_impl.hpp
 	include/carve/faceloop.hpp
-	include/carve/mesh_ops.hpp
-	include/carve/tree.hpp
 	include/carve/geom2d.hpp
-	include/carve/face_impl.hpp
-	include/carve/polyhedron_decl.hpp
+	include/carve/geom3d.hpp
+	include/carve/geom.hpp
+	include/carve/geom_impl.hpp
+	include/carve/gnu_cxx.h
+	include/carve/heap.hpp
+	include/carve/input.hpp
 	include/carve/interpolator.hpp
-	include/carve/poly_decl.hpp
+	include/carve/intersection.hpp
+	include/carve/iobj.hpp
+	include/carve/kd_node.hpp
+	include/carve/math_constants.hpp
+	include/carve/math.hpp
+	include/carve/matrix.hpp
+	include/carve/mesh.hpp
 	include/carve/mesh_impl.hpp
-	include/carve/gnu_cxx.h
+	include/carve/mesh_ops.hpp
 	include/carve/mesh_simplify.hpp
-	include/carve/triangulator.hpp
-	include/carve/pointset_impl.hpp
-	include/carve/rtree.hpp
-	include/carve/math_constants.hpp
-	include/carve/vector.hpp
+	include/carve/octree_decl.hpp
 	include/carve/octree_impl.hpp
+	include/carve/pointset_decl.hpp
 	include/carve/pointset.hpp
-	include/carve/math.hpp
-	include/carve/intersection.hpp
-	include/carve/colour.hpp
-	include/carve/kd_node.hpp
-	include/carve/input.hpp
-	include/carve/geom3d.hpp
-	include/carve/exact.hpp
+	include/carve/pointset_impl.hpp
+	include/carve/pointset_iter.hpp
+	include/carve/poly_decl.hpp
+	include/carve/polyhedron_base.hpp
+	include/carve/polyhedron_decl.hpp
+	include/carve/polyhedron_impl.hpp
+	include/carve/poly.hpp
+	include/carve/poly_impl.hpp
+	include/carve/polyline_decl.hpp
+	include/carve/polyline.hpp
+	include/carve/polyline_impl.hpp
+	include/carve/polyline_iter.hpp
 	include/carve/rescale.hpp
-	include/carve/polyhedron_base.hpp
-	include/carve/heap.hpp
+	include/carve/rtree.hpp
 	include/carve/spacetree.hpp
-	include/carve/polyhedron_impl.hpp
+	include/carve/tag.hpp
+	include/carve/timing.hpp
+	include/carve/tree.hpp
+	include/carve/triangulator.hpp
+	include/carve/triangulator_impl.hpp
+	include/carve/util.hpp
 	include/carve/vcpp_config.h
-	include/carve/aabb.hpp
-	include/carve/polyline_iter.hpp
-	include/carve/djset.hpp
+	include/carve/vector.hpp
 	include/carve/vertex_decl.hpp
-	include/carve/csg_triangulator.hpp
-	include/carve/poly.hpp
-	include/carve/timing.hpp
-	include/carve/octree_decl.hpp

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list