[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43605] branches/asset-browser: merge from trunk, up to rev.

Andrea Weikert elubie at gmx.net
Sun Jan 22 15:22:10 CET 2012


Revision: 43605
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43605
Author:   elubie
Date:     2012-01-22 14:21:59 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
merge from trunk, up to rev. 43211

Modified Paths:
--------------
    branches/asset-browser/CMakeLists.txt
    branches/asset-browser/SConstruct
    branches/asset-browser/build_files/cmake/RpmBuild.cmake
    branches/asset-browser/build_files/cmake/cmake_static_check_cppcheck.py
    branches/asset-browser/build_files/cmake/config/blender_lite.cmake
    branches/asset-browser/build_files/cmake/project_info.py
    branches/asset-browser/build_files/cmake/project_source_info.py
    branches/asset-browser/build_files/scons/config/freebsd7-config.py
    branches/asset-browser/build_files/scons/config/freebsd8-config.py
    branches/asset-browser/build_files/scons/config/freebsd9-config.py
    branches/asset-browser/build_files/scons/config/linux-config.py
    branches/asset-browser/build_files/scons/tools/Blender.py
    branches/asset-browser/build_files/scons/tools/btools.py
    branches/asset-browser/doc/python_api/examples/bpy.types.Menu.1.py
    branches/asset-browser/doc/python_api/examples/bpy.types.Menu.py
    branches/asset-browser/doc/python_api/examples/bpy.types.Panel.1.py
    branches/asset-browser/doc/python_api/rst/bge.texture.rst
    branches/asset-browser/doc/python_api/rst/bge.types.rst
    branches/asset-browser/doc/python_api/rst/info_best_practice.rst
    branches/asset-browser/doc/python_api/rst/info_overview.rst
    branches/asset-browser/doc/python_api/rst/info_quickstart.rst
    branches/asset-browser/doc/python_api/rst/info_tips_and_tricks.rst
    branches/asset-browser/extern/CMakeLists.txt
    branches/asset-browser/extern/SConscript
    branches/asset-browser/extern/libmv/CMakeLists.txt
    branches/asset-browser/extern/libmv/SConscript
    branches/asset-browser/extern/libmv/bundle.sh
    branches/asset-browser/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
    branches/asset-browser/extern/libmv/third_party/glog/src/utilities.cc
    branches/asset-browser/intern/boolop/CMakeLists.txt
    branches/asset-browser/intern/boolop/SConscript
    branches/asset-browser/intern/boolop/intern/BOP_BSPNode.cpp
    branches/asset-browser/intern/boolop/intern/BOP_BSPNode.h
    branches/asset-browser/intern/boolop/intern/BOP_BSPTree.cpp
    branches/asset-browser/intern/boolop/intern/BOP_Edge.cpp
    branches/asset-browser/intern/boolop/intern/BOP_Face.h
    branches/asset-browser/intern/boolop/intern/BOP_Indexs.h
    branches/asset-browser/intern/boolop/intern/BOP_Interface.cpp
    branches/asset-browser/intern/boolop/intern/BOP_MathUtils.cpp
    branches/asset-browser/intern/boolop/intern/BOP_Merge.h
    branches/asset-browser/intern/boolop/intern/BOP_Merge2.h
    branches/asset-browser/intern/boolop/intern/BOP_Mesh.h
    branches/asset-browser/intern/boolop/intern/BOP_Segment.cpp
    branches/asset-browser/intern/boolop/intern/BOP_Segment.h
    branches/asset-browser/intern/boolop/intern/BOP_Splitter.cpp
    branches/asset-browser/intern/boolop/intern/BOP_Triangulator.cpp
    branches/asset-browser/intern/cycles/app/cycles_xml.cpp
    branches/asset-browser/intern/cycles/blender/CMakeLists.txt
    branches/asset-browser/intern/cycles/blender/addon/__init__.py
    branches/asset-browser/intern/cycles/blender/addon/engine.py
    branches/asset-browser/intern/cycles/blender/addon/enums.py
    branches/asset-browser/intern/cycles/blender/addon/properties.py
    branches/asset-browser/intern/cycles/blender/addon/ui.py
    branches/asset-browser/intern/cycles/blender/blender_object.cpp
    branches/asset-browser/intern/cycles/blender/blender_python.cpp
    branches/asset-browser/intern/cycles/blender/blender_session.cpp
    branches/asset-browser/intern/cycles/blender/blender_session.h
    branches/asset-browser/intern/cycles/blender/blender_shader.cpp
    branches/asset-browser/intern/cycles/blender/blender_sync.cpp
    branches/asset-browser/intern/cycles/blender/blender_sync.h
    branches/asset-browser/intern/cycles/bvh/bvh.cpp
    branches/asset-browser/intern/cycles/bvh/bvh.h
    branches/asset-browser/intern/cycles/bvh/bvh_params.h
    branches/asset-browser/intern/cycles/device/device.cpp
    branches/asset-browser/intern/cycles/device/device.h
    branches/asset-browser/intern/cycles/device/device_cpu.cpp
    branches/asset-browser/intern/cycles/device/device_cuda.cpp
    branches/asset-browser/intern/cycles/device/device_multi.cpp
    branches/asset-browser/intern/cycles/device/device_network.cpp
    branches/asset-browser/intern/cycles/device/device_opencl.cpp
    branches/asset-browser/intern/cycles/kernel/CMakeLists.txt
    branches/asset-browser/intern/cycles/kernel/kernel.cl
    branches/asset-browser/intern/cycles/kernel/kernel.cpp
    branches/asset-browser/intern/cycles/kernel/kernel.cu
    branches/asset-browser/intern/cycles/kernel/kernel.h
    branches/asset-browser/intern/cycles/kernel/kernel_compat_cpu.h
    branches/asset-browser/intern/cycles/kernel/kernel_compat_cuda.h
    branches/asset-browser/intern/cycles/kernel/kernel_differential.h
    branches/asset-browser/intern/cycles/kernel/kernel_displace.h
    branches/asset-browser/intern/cycles/kernel/kernel_emission.h
    branches/asset-browser/intern/cycles/kernel/kernel_light.h
    branches/asset-browser/intern/cycles/kernel/kernel_montecarlo.h
    branches/asset-browser/intern/cycles/kernel/kernel_optimized.cpp
    branches/asset-browser/intern/cycles/kernel/kernel_path.h
    branches/asset-browser/intern/cycles/kernel/kernel_shader.h
    branches/asset-browser/intern/cycles/kernel/kernel_textures.h
    branches/asset-browser/intern/cycles/kernel/kernel_types.h
    branches/asset-browser/intern/cycles/kernel/svm/svm.h
    branches/asset-browser/intern/cycles/kernel/svm/svm_image.h
    branches/asset-browser/intern/cycles/kernel/svm/svm_musgrave.h
    branches/asset-browser/intern/cycles/kernel/svm/svm_types.h
    branches/asset-browser/intern/cycles/render/buffers.cpp
    branches/asset-browser/intern/cycles/render/light.cpp
    branches/asset-browser/intern/cycles/render/light.h
    branches/asset-browser/intern/cycles/render/mesh.cpp
    branches/asset-browser/intern/cycles/render/mesh_displace.cpp
    branches/asset-browser/intern/cycles/render/nodes.cpp
    branches/asset-browser/intern/cycles/render/nodes.h
    branches/asset-browser/intern/cycles/render/scene.h
    branches/asset-browser/intern/cycles/render/session.cpp
    branches/asset-browser/intern/cycles/util/util_cache.cpp
    branches/asset-browser/intern/cycles/util/util_cache.h
    branches/asset-browser/intern/cycles/util/util_progress.h
    branches/asset-browser/intern/ghost/GHOST_ISystem.h
    branches/asset-browser/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_NDOFManager.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_NDOFManager.h
    branches/asset-browser/intern/ghost/intern/GHOST_System.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_System.h
    branches/asset-browser/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/asset-browser/intern/ghost/test/CMakeLists.txt
    branches/asset-browser/release/scripts/modules/addon_utils.py
    branches/asset-browser/release/scripts/modules/animsys_refactor.py
    branches/asset-browser/release/scripts/modules/bpy/utils.py
    branches/asset-browser/release/scripts/modules/bpy_extras/keyconfig_utils.py
    branches/asset-browser/release/scripts/modules/rna_xml.py
    branches/asset-browser/release/scripts/presets/ffmpeg/DV.py
    branches/asset-browser/release/scripts/presets/ffmpeg/DVD.py
    branches/asset-browser/release/scripts/presets/ffmpeg/SVCD.py
    branches/asset-browser/release/scripts/presets/ffmpeg/VCD.py
    branches/asset-browser/release/scripts/presets/ffmpeg/h264.py
    branches/asset-browser/release/scripts/presets/ffmpeg/theora.py
    branches/asset-browser/release/scripts/presets/ffmpeg/xvid.py
    branches/asset-browser/release/scripts/presets/keyconfig/maya.py
    branches/asset-browser/release/scripts/startup/bl_operators/clip.py
    branches/asset-browser/release/scripts/startup/bl_operators/mesh.py
    branches/asset-browser/release/scripts/startup/bl_operators/presets.py
    branches/asset-browser/release/scripts/startup/bl_operators/wm.py
    branches/asset-browser/release/scripts/startup/bl_ui/__init__.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_game.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_render.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_scene.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_texture.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_clip.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_graph.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_image.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_info.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_logic.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_nla.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_sequencer.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_time.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_userpref.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_view3d.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/asset-browser/release/scripts/templates/addon_add_object.py
    branches/asset-browser/source/blender/blenfont/BLF_api.h
    branches/asset-browser/source/blender/blenfont/intern/blf_lang.c
    branches/asset-browser/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/asset-browser/source/blender/blenkernel/BKE_armature.h
    branches/asset-browser/source/blender/blenkernel/BKE_blender.h
    branches/asset-browser/source/blender/blenkernel/BKE_brush.h
    branches/asset-browser/source/blender/blenkernel/BKE_cloth.h
    branches/asset-browser/source/blender/blenkernel/BKE_deform.h
    branches/asset-browser/source/blender/blenkernel/BKE_global.h
    branches/asset-browser/source/blender/blenkernel/BKE_image.h
    branches/asset-browser/source/blender/blenkernel/BKE_main.h
    branches/asset-browser/source/blender/blenkernel/BKE_mesh.h
    branches/asset-browser/source/blender/blenkernel/BKE_movieclip.h
    branches/asset-browser/source/blender/blenkernel/BKE_node.h
    branches/asset-browser/source/blender/blenkernel/BKE_sequencer.h
    branches/asset-browser/source/blender/blenkernel/BKE_text.h
    branches/asset-browser/source/blender/blenkernel/BKE_tracking.h
    branches/asset-browser/source/blender/blenkernel/BKE_utildefines.h
    branches/asset-browser/source/blender/blenkernel/BKE_writeavi.h
    branches/asset-browser/source/blender/blenkernel/BKE_writeffmpeg.h
    branches/asset-browser/source/blender/blenkernel/BKE_writeframeserver.h
    branches/asset-browser/source/blender/blenkernel/CMakeLists.txt
    branches/asset-browser/source/blender/blenkernel/intern/DerivedMesh.c
    branches/asset-browser/source/blender/blenkernel/intern/armature.c
    branches/asset-browser/source/blender/blenkernel/intern/boids.c
    branches/asset-browser/source/blender/blenkernel/intern/brush.c
    branches/asset-browser/source/blender/blenkernel/intern/cloth.c
    branches/asset-browser/source/blender/blenkernel/intern/colortools.c
    branches/asset-browser/source/blender/blenkernel/intern/constraint.c
    branches/asset-browser/source/blender/blenkernel/intern/curve.c
    branches/asset-browser/source/blender/blenkernel/intern/customdata.c
    branches/asset-browser/source/blender/blenkernel/intern/deform.c
    branches/asset-browser/source/blender/blenkernel/intern/displist.c
    branches/asset-browser/source/blender/blenkernel/intern/dynamicpaint.c
    branches/asset-browser/source/blender/blenkernel/intern/image.c
    branches/asset-browser/source/blender/blenkernel/intern/image_gen.c
    branches/asset-browser/source/blender/blenkernel/intern/ipo.c
    branches/asset-browser/source/blender/blenkernel/intern/key.c
    branches/asset-browser/source/blender/blenkernel/intern/library.c
    branches/asset-browser/source/blender/blenkernel/intern/material.c
    branches/asset-browser/source/blender/blenkernel/intern/mball.c
    branches/asset-browser/source/blender/blenkernel/intern/mesh.c
    branches/asset-browser/source/blender/blenkernel/intern/movieclip.c
    branches/asset-browser/source/blender/blenkernel/intern/multires.c
    branches/asset-browser/source/blender/blenkernel/intern/nla.c
    branches/asset-browser/source/blender/blenkernel/intern/node.c
    branches/asset-browser/source/blender/blenkernel/intern/object.c
    branches/asset-browser/source/blender/blenkernel/intern/packedFile.c
    branches/asset-browser/source/blender/blenkernel/intern/paint.c
    branches/asset-browser/source/blender/blenkernel/intern/particle.c
    branches/asset-browser/source/blender/blenkernel/intern/pointcache.c
    branches/asset-browser/source/blender/blenkernel/intern/property.c
    branches/asset-browser/source/blender/blenkernel/intern/sca.c
    branches/asset-browser/source/blender/blenkernel/intern/scene.c
    branches/asset-browser/source/blender/blenkernel/intern/seqeffects.c
    branches/asset-browser/source/blender/blenkernel/intern/sequencer.c
    branches/asset-browser/source/blender/blenkernel/intern/softbody.c
    branches/asset-browser/source/blender/blenkernel/intern/sound.c
    branches/asset-browser/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/asset-browser/source/blender/blenkernel/intern/text.c
    branches/asset-browser/source/blender/blenkernel/intern/texture.c
    branches/asset-browser/source/blender/blenkernel/intern/tracking.c
    branches/asset-browser/source/blender/blenkernel/intern/writeavi.c
    branches/asset-browser/source/blender/blenkernel/intern/writeffmpeg.c
    branches/asset-browser/source/blender/blenkernel/intern/writeframeserver.c
    branches/asset-browser/source/blender/blenlib/BLI_editVert.h
    branches/asset-browser/source/blender/blenlib/BLI_fnmatch.h
    branches/asset-browser/source/blender/blenlib/BLI_math_color.h
    branches/asset-browser/source/blender/blenlib/BLI_math_geom.h
    branches/asset-browser/source/blender/blenlib/BLI_math_vector.h
    branches/asset-browser/source/blender/blenlib/BLI_utildefines.h
    branches/asset-browser/source/blender/blenlib/intern/BLI_ghash.c
    branches/asset-browser/source/blender/blenlib/intern/boxpack2d.c
    branches/asset-browser/source/blender/blenlib/intern/fileops.c
    branches/asset-browser/source/blender/blenlib/intern/math_color.c
    branches/asset-browser/source/blender/blenlib/intern/math_color_inline.c
    branches/asset-browser/source/blender/blenlib/intern/math_geom.c
    branches/asset-browser/source/blender/blenlib/intern/math_rotation.c
    branches/asset-browser/source/blender/blenlib/intern/math_vector.c
    branches/asset-browser/source/blender/blenlib/intern/math_vector_inline.c
    branches/asset-browser/source/blender/blenlib/intern/path_util.c
    branches/asset-browser/source/blender/blenlib/intern/storage.c
    branches/asset-browser/source/blender/blenloader/BLO_readfile.h
    branches/asset-browser/source/blender/blenloader/intern/readfile.c
    branches/asset-browser/source/blender/blenloader/intern/writefile.c
    branches/asset-browser/source/blender/blenpluginapi/iff.h
    branches/asset-browser/source/blender/editors/animation/anim_channels_defines.c
    branches/asset-browser/source/blender/editors/animation/anim_channels_edit.c
    branches/asset-browser/source/blender/editors/animation/anim_draw.c
    branches/asset-browser/source/blender/editors/animation/anim_ipo_utils.c
    branches/asset-browser/source/blender/editors/animation/anim_markers.c
    branches/asset-browser/source/blender/editors/animation/anim_ops.c
    branches/asset-browser/source/blender/editors/animation/keyframing.c
    branches/asset-browser/source/blender/editors/armature/armature_intern.h
    branches/asset-browser/source/blender/editors/armature/armature_ops.c
    branches/asset-browser/source/blender/editors/armature/editarmature.c
    branches/asset-browser/source/blender/editors/armature/editarmature_retarget.c
    branches/asset-browser/source/blender/editors/armature/meshlaplacian.c
    branches/asset-browser/source/blender/editors/armature/poseSlide.c
    branches/asset-browser/source/blender/editors/armature/poselib.c
    branches/asset-browser/source/blender/editors/armature/poseobject.c
    branches/asset-browser/source/blender/editors/armature/reeb.c
    branches/asset-browser/source/blender/editors/curve/curve_intern.h
    branches/asset-browser/source/blender/editors/curve/curve_ops.c
    branches/asset-browser/source/blender/editors/curve/editcurve.c
    branches/asset-browser/source/blender/editors/curve/editfont.c
    branches/asset-browser/source/blender/editors/datafiles/Bfont.c
    branches/asset-browser/source/blender/editors/gpencil/gpencil_buttons.c
    branches/asset-browser/source/blender/editors/gpencil/gpencil_ops.c
    branches/asset-browser/source/blender/editors/include/ED_armature.h
    branches/asset-browser/source/blender/editors/include/ED_image.h
    branches/asset-browser/source/blender/editors/include/ED_mesh.h
    branches/asset-browser/source/blender/editors/include/ED_object.h
    branches/asset-browser/source/blender/editors/include/ED_uvedit.h
    branches/asset-browser/source/blender/editors/include/ED_view3d.h
    branches/asset-browser/source/blender/editors/include/UI_interface.h
    branches/asset-browser/source/blender/editors/include/UI_interface_icons.h
    branches/asset-browser/source/blender/editors/include/UI_resources.h
    branches/asset-browser/source/blender/editors/interface/interface.c
    branches/asset-browser/source/blender/editors/interface/interface_draw.c
    branches/asset-browser/source/blender/editors/interface/interface_handlers.c
    branches/asset-browser/source/blender/editors/interface/interface_intern.h
    branches/asset-browser/source/blender/editors/interface/interface_layout.c
    branches/asset-browser/source/blender/editors/interface/interface_ops.c
    branches/asset-browser/source/blender/editors/interface/interface_panel.c
    branches/asset-browser/source/blender/editors/interface/interface_regions.c
    branches/asset-browser/source/blender/editors/interface/interface_style.c
    branches/asset-browser/source/blender/editors/interface/interface_templates.c
    branches/asset-browser/source/blender/editors/interface/interface_widgets.c
    branches/asset-browser/source/blender/editors/interface/resources.c
    branches/asset-browser/source/blender/editors/interface/view2d.c
    branches/asset-browser/source/blender/editors/interface/view2d_ops.c
    branches/asset-browser/source/blender/editors/mesh/editmesh.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_lib.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_loop.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_mods.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_tools.c
    branches/asset-browser/source/blender/editors/mesh/loopcut.c
    branches/asset-browser/source/blender/editors/mesh/mesh_data.c
    branches/asset-browser/source/blender/editors/mesh/mesh_intern.h
    branches/asset-browser/source/blender/editors/mesh/mesh_ops.c
    branches/asset-browser/source/blender/editors/metaball/mball_edit.c
    branches/asset-browser/source/blender/editors/metaball/mball_intern.h
    branches/asset-browser/source/blender/editors/metaball/mball_ops.c
    branches/asset-browser/source/blender/editors/object/object_add.c
    branches/asset-browser/source/blender/editors/object/object_bake.c
    branches/asset-browser/source/blender/editors/object/object_constraint.c
    branches/asset-browser/source/blender/editors/object/object_edit.c
    branches/asset-browser/source/blender/editors/object/object_group.c
    branches/asset-browser/source/blender/editors/object/object_hook.c
    branches/asset-browser/source/blender/editors/object/object_intern.h
    branches/asset-browser/source/blender/editors/object/object_modifier.c
    branches/asset-browser/source/blender/editors/object/object_ops.c
    branches/asset-browser/source/blender/editors/object/object_relations.c
    branches/asset-browser/source/blender/editors/object/object_select.c
    branches/asset-browser/source/blender/editors/object/object_transform.c
    branches/asset-browser/source/blender/editors/object/object_vgroup.c
    branches/asset-browser/source/blender/editors/physics/particle_edit.c
    branches/asset-browser/source/blender/editors/physics/physics_fluid.c
    branches/asset-browser/source/blender/editors/physics/physics_intern.h
    branches/asset-browser/source/blender/editors/physics/physics_ops.c
    branches/asset-browser/source/blender/editors/render/render_internal.c
    branches/asset-browser/source/blender/editors/render/render_opengl.c
    branches/asset-browser/source/blender/editors/render/render_preview.c
    branches/asset-browser/source/blender/editors/render/render_shading.c
    branches/asset-browser/source/blender/editors/screen/area.c
    branches/asset-browser/source/blender/editors/screen/screen_edit.c
    branches/asset-browser/source/blender/editors/screen/screen_ops.c
    branches/asset-browser/source/blender/editors/screen/screendump.c
    branches/asset-browser/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/asset-browser/source/blender/editors/sculpt_paint/SConscript
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_image.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_intern.h
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_ops.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_utils.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/asset-browser/source/blender/editors/sculpt_paint/sculpt.c
    branches/asset-browser/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/asset-browser/source/blender/editors/sound/sound_ops.c
    branches/asset-browser/source/blender/editors/space_action/action_draw.c
    branches/asset-browser/source/blender/editors/space_action/action_ops.c
    branches/asset-browser/source/blender/editors/space_buttons/buttons_context.c
    branches/asset-browser/source/blender/editors/space_buttons/buttons_header.c
    branches/asset-browser/source/blender/editors/space_buttons/buttons_ops.c
    branches/asset-browser/source/blender/editors/space_buttons/space_buttons.c
    branches/asset-browser/source/blender/editors/space_clip/clip_draw.c
    branches/asset-browser/source/blender/editors/space_clip/clip_editor.c
    branches/asset-browser/source/blender/editors/space_clip/clip_graph_draw.c
    branches/asset-browser/source/blender/editors/space_clip/clip_graph_ops.c
    branches/asset-browser/source/blender/editors/space_clip/clip_intern.h
    branches/asset-browser/source/blender/editors/space_clip/clip_ops.c
    branches/asset-browser/source/blender/editors/space_clip/clip_utils.c
    branches/asset-browser/source/blender/editors/space_clip/space_clip.c
    branches/asset-browser/source/blender/editors/space_clip/tracking_ops.c
    branches/asset-browser/source/blender/editors/space_console/console_ops.c
    branches/asset-browser/source/blender/editors/space_console/space_console.c
    branches/asset-browser/source/blender/editors/space_file/file_draw.c
    branches/asset-browser/source/blender/editors/space_file/filelist.c
    branches/asset-browser/source/blender/editors/space_file/filesel.c
    branches/asset-browser/source/blender/editors/space_file/space_file.c
    branches/asset-browser/source/blender/editors/space_graph/graph_buttons.c
    branches/asset-browser/source/blender/editors/space_graph/graph_draw.c
    branches/asset-browser/source/blender/editors/space_graph/graph_edit.c
    branches/asset-browser/source/blender/editors/space_graph/graph_ops.c
    branches/asset-browser/source/blender/editors/space_graph/graph_select.c
    branches/asset-browser/source/blender/editors/space_image/image_buttons.c
    branches/asset-browser/source/blender/editors/space_image/image_draw.c
    branches/asset-browser/source/blender/editors/space_image/image_intern.h
    branches/asset-browser/source/blender/editors/space_image/image_ops.c
    branches/asset-browser/source/blender/editors/space_image/space_image.c
    branches/asset-browser/source/blender/editors/space_info/info_ops.c
    branches/asset-browser/source/blender/editors/space_logic/logic_ops.c
    branches/asset-browser/source/blender/editors/space_logic/logic_window.c
    branches/asset-browser/source/blender/editors/space_nla/nla_draw.c
    branches/asset-browser/source/blender/editors/space_nla/nla_ops.c
    branches/asset-browser/source/blender/editors/space_node/drawnode.c
    branches/asset-browser/source/blender/editors/space_node/node_draw.c
    branches/asset-browser/source/blender/editors/space_node/node_edit.c
    branches/asset-browser/source/blender/editors/space_node/node_intern.h
    branches/asset-browser/source/blender/editors/space_node/node_ops.c
    branches/asset-browser/source/blender/editors/space_node/node_templates.c
    branches/asset-browser/source/blender/editors/space_outliner/outliner_draw.c
    branches/asset-browser/source/blender/editors/space_outliner/outliner_edit.c
    branches/asset-browser/source/blender/editors/space_outliner/outliner_intern.h
    branches/asset-browser/source/blender/editors/space_outliner/outliner_ops.c
    branches/asset-browser/source/blender/editors/space_outliner/outliner_select.c
    branches/asset-browser/source/blender/editors/space_outliner/outliner_tree.c
    branches/asset-browser/source/blender/editors/space_outliner/space_outliner.c
    branches/asset-browser/source/blender/editors/space_script/script_edit.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_add.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_scopes.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_select.c
    branches/asset-browser/source/blender/editors/space_text/space_text.c
    branches/asset-browser/source/blender/editors/space_text/text_draw.c
    branches/asset-browser/source/blender/editors/space_text/text_intern.h
    branches/asset-browser/source/blender/editors/space_text/text_ops.c
    branches/asset-browser/source/blender/editors/space_view3d/drawanimviz.c
    branches/asset-browser/source/blender/editors/space_view3d/drawarmature.c
    branches/asset-browser/source/blender/editors/space_view3d/drawmesh.c
    branches/asset-browser/source/blender/editors/space_view3d/drawobject.c
    branches/asset-browser/source/blender/editors/space_view3d/drawvolume.c
    branches/asset-browser/source/blender/editors/space_view3d/space_view3d.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_buttons.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_draw.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_edit.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_fly.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_header.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_intern.h
    branches/asset-browser/source/blender/editors/space_view3d/view3d_ops.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_select.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_snap.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_view.c
    branches/asset-browser/source/blender/editors/transform/transform.c
    branches/asset-browser/source/blender/editors/transform/transform.h
    branches/asset-browser/source/blender/editors/transform/transform_constraints.c
    branches/asset-browser/source/blender/editors/transform/transform_conversions.c
    branches/asset-browser/source/blender/editors/transform/transform_generics.c
    branches/asset-browser/source/blender/editors/transform/transform_ops.c
    branches/asset-browser/source/blender/editors/transform/transform_orientations.c
    branches/asset-browser/source/blender/editors/transform/transform_snap.c
    branches/asset-browser/source/blender/editors/util/ed_util.c
    branches/asset-browser/source/blender/editors/util/numinput.c
    branches/asset-browser/source/blender/editors/util/undo.c
    branches/asset-browser/source/blender/editors/uvedit/CMakeLists.txt
    branches/asset-browser/source/blender/editors/uvedit/uvedit_draw.c
    branches/asset-browser/source/blender/editors/uvedit/uvedit_intern.h
    branches/asset-browser/source/blender/editors/uvedit/uvedit_ops.c
    branches/asset-browser/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/asset-browser/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/asset-browser/source/blender/gpu/GPU_extensions.h
    branches/asset-browser/source/blender/gpu/intern/gpu_codegen.c
    branches/asset-browser/source/blender/gpu/intern/gpu_draw.c
    branches/asset-browser/source/blender/gpu/intern/gpu_extensions.c
    branches/asset-browser/source/blender/gpu/intern/gpu_material.c
    branches/asset-browser/source/blender/imbuf/IMB_imbuf_types.h
    branches/asset-browser/source/blender/imbuf/intern/IMB_anim.h
    branches/asset-browser/source/blender/imbuf/intern/IMB_indexer.h
    branches/asset-browser/source/blender/imbuf/intern/anim_movie.c
    branches/asset-browser/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/asset-browser/source/blender/imbuf/intern/divers.c
    branches/asset-browser/source/blender/imbuf/intern/indexer.c
    branches/asset-browser/source/blender/imbuf/intern/tiff.c
    branches/asset-browser/source/blender/makesdna/DNA_ID.h
    branches/asset-browser/source/blender/makesdna/DNA_action_types.h
    branches/asset-browser/source/blender/makesdna/DNA_actuator_types.h
    branches/asset-browser/source/blender/makesdna/DNA_armature_types.h
    branches/asset-browser/source/blender/makesdna/DNA_brush_types.h
    branches/asset-browser/source/blender/makesdna/DNA_constraint_types.h
    branches/asset-browser/source/blender/makesdna/DNA_controller_types.h
    branches/asset-browser/source/blender/makesdna/DNA_customdata_types.h
    branches/asset-browser/source/blender/makesdna/DNA_defs.h
    branches/asset-browser/source/blender/makesdna/DNA_dynamicpaint_types.h
    branches/asset-browser/source/blender/makesdna/DNA_effect_types.h
    branches/asset-browser/source/blender/makesdna/DNA_fileglobal_types.h
    branches/asset-browser/source/blender/makesdna/DNA_image_types.h
    branches/asset-browser/source/blender/makesdna/DNA_key_types.h
    branches/asset-browser/source/blender/makesdna/DNA_lattice_types.h
    branches/asset-browser/source/blender/makesdna/DNA_material_types.h
    branches/asset-browser/source/blender/makesdna/DNA_meta_types.h
    branches/asset-browser/source/blender/makesdna/DNA_modifier_types.h
    branches/asset-browser/source/blender/makesdna/DNA_movieclip_types.h
    branches/asset-browser/source/blender/makesdna/DNA_node_types.h
    branches/asset-browser/source/blender/makesdna/DNA_object_fluidsim.h
    branches/asset-browser/source/blender/makesdna/DNA_object_force.h
    branches/asset-browser/source/blender/makesdna/DNA_object_types.h
    branches/asset-browser/source/blender/makesdna/DNA_particle_types.h
    branches/asset-browser/source/blender/makesdna/DNA_property_types.h
    branches/asset-browser/source/blender/makesdna/DNA_scene_types.h
    branches/asset-browser/source/blender/makesdna/DNA_sensor_types.h
    branches/asset-browser/source/blender/makesdna/DNA_sequence_types.h
    branches/asset-browser/source/blender/makesdna/DNA_sound_types.h
    branches/asset-browser/source/blender/makesdna/DNA_space_types.h
    branches/asset-browser/source/blender/makesdna/DNA_texture_types.h
    branches/asset-browser/source/blender/makesdna/DNA_tracking_types.h
    branches/asset-browser/source/blender/makesdna/DNA_userdef_types.h
    branches/asset-browser/source/blender/makesdna/DNA_vfont_types.h
    branches/asset-browser/source/blender/makesdna/DNA_view3d_types.h
    branches/asset-browser/source/blender/makesdna/DNA_windowmanager_types.h
    branches/asset-browser/source/blender/makesrna/RNA_access.h
    branches/asset-browser/source/blender/makesrna/SConscript
    branches/asset-browser/source/blender/makesrna/intern/CMakeLists.txt
    branches/asset-browser/source/blender/makesrna/intern/SConscript
    branches/asset-browser/source/blender/makesrna/intern/rna_access.c
    branches/asset-browser/source/blender/makesrna/intern/rna_actuator.c
    branches/asset-browser/source/blender/makesrna/intern/rna_brush.c
    branches/asset-browser/source/blender/makesrna/intern/rna_controller.c
    branches/asset-browser/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/asset-browser/source/blender/makesrna/intern/rna_fluidsim.c
    branches/asset-browser/source/blender/makesrna/intern/rna_image.c
    branches/asset-browser/source/blender/makesrna/intern/rna_main.c
    branches/asset-browser/source/blender/makesrna/intern/rna_mesh.c
    branches/asset-browser/source/blender/makesrna/intern/rna_modifier.c
    branches/asset-browser/source/blender/makesrna/intern/rna_nodetree.c
    branches/asset-browser/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/asset-browser/source/blender/makesrna/intern/rna_object.c
    branches/asset-browser/source/blender/makesrna/intern/rna_object_api.c
    branches/asset-browser/source/blender/makesrna/intern/rna_scene.c
    branches/asset-browser/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/asset-browser/source/blender/makesrna/intern/rna_sensor.c
    branches/asset-browser/source/blender/makesrna/intern/rna_space.c
    branches/asset-browser/source/blender/makesrna/intern/rna_tracking.c
    branches/asset-browser/source/blender/makesrna/intern/rna_ui.c
    branches/asset-browser/source/blender/makesrna/intern/rna_userdef.c
    branches/asset-browser/source/blender/makesrna/intern/rna_wm.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_armature.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_bevel.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_boolean.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_build.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_cast.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_curve.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_displace.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_hook.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_lattice.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_smooth.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_solidify.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_util.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_uvproject.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_wave.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_weightvg_util.h
    branches/asset-browser/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/asset-browser/source/blender/nodes/CMakeLists.txt
    branches/asset-browser/source/blender/nodes/NOD_composite.h
    branches/asset-browser/source/blender/nodes/NOD_shader.h
    branches/asset-browser/source/blender/nodes/NOD_socket.h
    branches/asset-browser/source/blender/nodes/composite/node_composite_tree.c
    branches/asset-browser/source/blender/nodes/composite/node_composite_util.c
    branches/asset-browser/source/blender/nodes/composite/node_composite_util.h
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/asset-browser/source/blender/nodes/intern/node_common.c
    branches/asset-browser/source/blender/nodes/intern/node_socket.c
    branches/asset-browser/source/blender/nodes/shader/node_shader_util.c
    branches/asset-browser/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/asset-browser/source/blender/python/SConscript
    branches/asset-browser/source/blender/python/generic/bpy_internal_import.c
    branches/asset-browser/source/blender/python/generic/idprop_py_api.c
    branches/asset-browser/source/blender/python/intern/CMakeLists.txt
    branches/asset-browser/source/blender/python/intern/bpy_interface.c
    branches/asset-browser/source/blender/python/intern/bpy_props.c
    branches/asset-browser/source/blender/python/intern/bpy_rna.c
    branches/asset-browser/source/blender/python/mathutils/mathutils_Matrix.c
    branches/asset-browser/source/blender/quicktime/apple/qtkit_export.m
    branches/asset-browser/source/blender/render/extern/include/RE_shader_ext.h
    branches/asset-browser/source/blender/render/intern/include/render_types.h
    branches/asset-browser/source/blender/render/intern/raytrace/rayobject.cpp
    branches/asset-browser/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
    branches/asset-browser/source/blender/render/intern/raytrace/rayobject_empty.cpp
    branches/asset-browser/source/blender/render/intern/raytrace/rayobject_instance.cpp
    branches/asset-browser/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/asset-browser/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    branches/asset-browser/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
    branches/asset-browser/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    branches/asset-browser/source/blender/render/intern/raytrace/vbvh.h
    branches/asset-browser/source/blender/render/intern/source/convertblender.c
    branches/asset-browser/source/blender/render/intern/source/imagetexture.c
    branches/asset-browser/source/blender/render/intern/source/pipeline.c
    branches/asset-browser/source/blender/render/intern/source/render_texture.c
    branches/asset-browser/source/blender/render/intern/source/rendercore.c
    branches/asset-browser/source/blender/render/intern/source/shadeoutput.c
    branches/asset-browser/source/blender/render/intern/source/zbuf.c
    branches/asset-browser/source/blender/windowmanager/WM_api.h
    branches/asset-browser/source/blender/windowmanager/WM_types.h
    branches/asset-browser/source/blender/windowmanager/intern/wm_dragdrop.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_event_system.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_init_exit.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_jobs.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_keymap.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_operators.c
    branches/asset-browser/source/blenderplayer/CMakeLists.txt
    branches/asset-browser/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/asset-browser/source/creator/CMakeLists.txt
    branches/asset-browser/source/creator/creator.c
    branches/asset-browser/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/asset-browser/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/asset-browser/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/asset-browser/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/asset-browser/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/asset-browser/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/asset-browser/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/asset-browser/source/gameengine/Expressions/PyObjectPlus.h
    branches/asset-browser/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_ILogicBrick.h
    branches/asset-browser/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/asset-browser/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_PythonKeyboard.h
    branches/asset-browser/source/gameengine/GameLogic/SCA_PythonMouse.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_PythonMouse.h
    branches/asset-browser/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/asset-browser/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/asset-browser/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/asset-browser/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/asset-browser/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/asset-browser/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_CameraActuator.h
    branches/asset-browser/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_GameObject.h
    branches/asset-browser/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/asset-browser/source/gameengine/Rasterizer/RAS_TexVert.cpp
    branches/asset-browser/source/gameengine/VideoTexture/blendVideoTex.cpp

Added Paths:
-----------
    branches/asset-browser/extern/carve/
    branches/asset-browser/extern/carve/CMakeLists.txt
    branches/asset-browser/extern/carve/LICENSE.GPL2
    branches/asset-browser/extern/carve/SConscript
    branches/asset-browser/extern/carve/bundle.sh
    branches/asset-browser/extern/carve/files.txt
    branches/asset-browser/extern/carve/include/
    branches/asset-browser/extern/carve/include/carve/
    branches/asset-browser/extern/carve/include/carve/aabb.hpp
    branches/asset-browser/extern/carve/include/carve/aabb_impl.hpp
    branches/asset-browser/extern/carve/include/carve/carve.hpp
    branches/asset-browser/extern/carve/include/carve/cbrt.h
    branches/asset-browser/extern/carve/include/carve/classification.hpp
    branches/asset-browser/extern/carve/include/carve/collection/
    branches/asset-browser/extern/carve/include/carve/collection/unordered/
    branches/asset-browser/extern/carve/include/carve/collection/unordered/boost_impl.hpp
    branches/asset-browser/extern/carve/include/carve/collection/unordered/fallback_impl.hpp
    branches/asset-browser/extern/carve/include/carve/collection/unordered/libstdcpp_impl.hpp
    branches/asset-browser/extern/carve/include/carve/collection/unordered/std_impl.hpp
    branches/asset-browser/extern/carve/include/carve/collection/unordered/tr1_impl.hpp
    branches/asset-browser/extern/carve/include/carve/collection/unordered/vcpp_impl.hpp
    branches/asset-browser/extern/carve/include/carve/collection/unordered.hpp
    branches/asset-browser/extern/carve/include/carve/collection.hpp
    branches/asset-browser/extern/carve/include/carve/collection_types.hpp
    branches/asset-browser/extern/carve/include/carve/colour.hpp
    branches/asset-browser/extern/carve/include/carve/config.h
    branches/asset-browser/extern/carve/include/carve/convex_hull.hpp
    branches/asset-browser/extern/carve/include/carve/csg.hpp
    branches/asset-browser/extern/carve/include/carve/csg_triangulator.hpp
    branches/asset-browser/extern/carve/include/carve/debug_hooks.hpp
    branches/asset-browser/extern/carve/include/carve/djset.hpp
    branches/asset-browser/extern/carve/include/carve/edge_decl.hpp
    branches/asset-browser/extern/carve/include/carve/edge_impl.hpp
    branches/asset-browser/extern/carve/include/carve/exact.hpp
    branches/asset-browser/extern/carve/include/carve/external/
    branches/asset-browser/extern/carve/include/carve/external/boost/
    branches/asset-browser/extern/carve/include/carve/external/boost/random.hpp
    branches/asset-browser/extern/carve/include/carve/face_decl.hpp
    branches/asset-browser/extern/carve/include/carve/face_impl.hpp
    branches/asset-browser/extern/carve/include/carve/faceloop.hpp
    branches/asset-browser/extern/carve/include/carve/geom.hpp
    branches/asset-browser/extern/carve/include/carve/geom2d.hpp
    branches/asset-browser/extern/carve/include/carve/geom3d.hpp
    branches/asset-browser/extern/carve/include/carve/geom_impl.hpp
    branches/asset-browser/extern/carve/include/carve/gnu_cxx.h
    branches/asset-browser/extern/carve/include/carve/heap.hpp
    branches/asset-browser/extern/carve/include/carve/input.hpp
    branches/asset-browser/extern/carve/include/carve/interpolator.hpp
    branches/asset-browser/extern/carve/include/carve/intersection.hpp
    branches/asset-browser/extern/carve/include/carve/iobj.hpp
    branches/asset-browser/extern/carve/include/carve/kd_node.hpp
    branches/asset-browser/extern/carve/include/carve/math.hpp
    branches/asset-browser/extern/carve/include/carve/math_constants.hpp
    branches/asset-browser/extern/carve/include/carve/matrix.hpp
    branches/asset-browser/extern/carve/include/carve/mesh.hpp
    branches/asset-browser/extern/carve/include/carve/mesh_impl.hpp
    branches/asset-browser/extern/carve/include/carve/mesh_ops.hpp
    branches/asset-browser/extern/carve/include/carve/mesh_simplify.hpp
    branches/asset-browser/extern/carve/include/carve/octree_decl.hpp
    branches/asset-browser/extern/carve/include/carve/octree_impl.hpp
    branches/asset-browser/extern/carve/include/carve/pointset.hpp
    branches/asset-browser/extern/carve/include/carve/pointset_decl.hpp
    branches/asset-browser/extern/carve/include/carve/pointset_impl.hpp
    branches/asset-browser/extern/carve/include/carve/pointset_iter.hpp
    branches/asset-browser/extern/carve/include/carve/poly.hpp
    branches/asset-browser/extern/carve/include/carve/poly_decl.hpp
    branches/asset-browser/extern/carve/include/carve/poly_impl.hpp
    branches/asset-browser/extern/carve/include/carve/polyhedron_base.hpp
    branches/asset-browser/extern/carve/include/carve/polyhedron_decl.hpp
    branches/asset-browser/extern/carve/include/carve/polyhedron_impl.hpp
    branches/asset-browser/extern/carve/include/carve/polyline.hpp
    branches/asset-browser/extern/carve/include/carve/polyline_decl.hpp
    branches/asset-browser/extern/carve/include/carve/polyline_impl.hpp
    branches/asset-browser/extern/carve/include/carve/polyline_iter.hpp
    branches/asset-browser/extern/carve/include/carve/rescale.hpp
    branches/asset-browser/extern/carve/include/carve/rtree.hpp
    branches/asset-browser/extern/carve/include/carve/spacetree.hpp
    branches/asset-browser/extern/carve/include/carve/tag.hpp
    branches/asset-browser/extern/carve/include/carve/timing.hpp
    branches/asset-browser/extern/carve/include/carve/tree.hpp
    branches/asset-browser/extern/carve/include/carve/triangulator.hpp
    branches/asset-browser/extern/carve/include/carve/triangulator_impl.hpp
    branches/asset-browser/extern/carve/include/carve/util.hpp
    branches/asset-browser/extern/carve/include/carve/vcpp_config.h
    branches/asset-browser/extern/carve/include/carve/vector.hpp
    branches/asset-browser/extern/carve/include/carve/vertex_decl.hpp
    branches/asset-browser/extern/carve/include/carve/vertex_impl.hpp
    branches/asset-browser/extern/carve/include/carve/win32.h
    branches/asset-browser/extern/carve/lib/
    branches/asset-browser/extern/carve/lib/aabb.cpp
    branches/asset-browser/extern/carve/lib/carve.cpp
    branches/asset-browser/extern/carve/lib/convex_hull.cpp
    branches/asset-browser/extern/carve/lib/csg.cpp
    branches/asset-browser/extern/carve/lib/csg_collector.cpp
    branches/asset-browser/extern/carve/lib/csg_collector.hpp
    branches/asset-browser/extern/carve/lib/csg_data.hpp
    branches/asset-browser/extern/carve/lib/csg_detail.hpp
    branches/asset-browser/extern/carve/lib/edge.cpp
    branches/asset-browser/extern/carve/lib/face.cpp
    branches/asset-browser/extern/carve/lib/geom2d.cpp
    branches/asset-browser/extern/carve/lib/geom3d.cpp
    branches/asset-browser/extern/carve/lib/intersect.cpp
    branches/asset-browser/extern/carve/lib/intersect_classify_common.hpp
    branches/asset-browser/extern/carve/lib/intersect_classify_common_impl.hpp
    branches/asset-browser/extern/carve/lib/intersect_classify_edge.cpp
    branches/asset-browser/extern/carve/lib/intersect_classify_group.cpp
    branches/asset-browser/extern/carve/lib/intersect_common.hpp
    branches/asset-browser/extern/carve/lib/intersect_debug.cpp
    branches/asset-browser/extern/carve/lib/intersect_debug.hpp
    branches/asset-browser/extern/carve/lib/intersect_face_division.cpp
    branches/asset-browser/extern/carve/lib/intersect_group.cpp
    branches/asset-browser/extern/carve/lib/intersect_half_classify_group.cpp
    branches/asset-browser/extern/carve/lib/intersection.cpp
    branches/asset-browser/extern/carve/lib/math.cpp
    branches/asset-browser/extern/carve/lib/mesh.cpp
    branches/asset-browser/extern/carve/lib/octree.cpp
    branches/asset-browser/extern/carve/lib/pointset.cpp
    branches/asset-browser/extern/carve/lib/polyhedron.cpp
    branches/asset-browser/extern/carve/lib/polyline.cpp
    branches/asset-browser/extern/carve/lib/tag.cpp
    branches/asset-browser/extern/carve/lib/timing.cpp
    branches/asset-browser/extern/carve/lib/triangulator.cpp
    branches/asset-browser/extern/carve/mkfiles.sh
    branches/asset-browser/extern/carve/patches/
    branches/asset-browser/extern/carve/patches/files/
    branches/asset-browser/extern/carve/patches/files/config.h
    branches/asset-browser/extern/carve/patches/files/random.hpp
    branches/asset-browser/extern/carve/patches/gcc46.patch
    branches/asset-browser/extern/carve/patches/includes.patch
    branches/asset-browser/extern/carve/patches/mesh_iterator.patch
    branches/asset-browser/extern/carve/patches/mingw.patch
    branches/asset-browser/extern/carve/patches/series
    branches/asset-browser/extern/carve/patches/strict_flags.patch
    branches/asset-browser/extern/carve/patches/win32.patch
    branches/asset-browser/intern/boolop/intern/BOP_CarveInterface.cpp
    branches/asset-browser/intern/cycles/blender/CCL_api.h
    branches/asset-browser/intern/cycles/kernel/svm/svm_checker.h
    branches/asset-browser/release/scripts/startup/bl_ui/properties_paint_common.py
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_cursor.c
    branches/asset-browser/source/blender/editors/sculpt_paint/sculpt_uv.c
    branches/asset-browser/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
    branches/asset-browser/source/tests/bl_mesh_modifiers.py

Removed Paths:
-------------
    branches/asset-browser/extern/carve/CMakeLists.txt
    branches/asset-browser/extern/carve/LICENSE.GPL2
    branches/asset-browser/extern/carve/SConscript
    branches/asset-browser/extern/carve/bundle.sh
    branches/asset-browser/extern/carve/files.txt
    branches/asset-browser/extern/carve/include/
    branches/asset-browser/extern/carve/include/carve/
    branches/asset-browser/extern/carve/include/carve/aabb.hpp
    branches/asset-browser/extern/carve/include/carve/aabb_impl.hpp
    branches/asset-browser/extern/carve/include/carve/carve.hpp
    branches/asset-browser/extern/carve/include/carve/cbrt.h
    branches/asset-browser/extern/carve/include/carve/classification.hpp
    branches/asset-browser/extern/carve/include/carve/collection/
    branches/asset-browser/extern/carve/include/carve/collection/unordered/
    branches/asset-browser/extern/carve/include/carve/collection/unordered/boost_impl.hpp
    branches/asset-browser/extern/carve/include/carve/collection/unordered/fallback_impl.hpp
    branches/asset-browser/extern/carve/include/carve/collection/unordered/libstdcpp_impl.hpp
    branches/asset-browser/extern/carve/include/carve/collection/unordered/std_impl.hpp
    branches/asset-browser/extern/carve/include/carve/collection/unordered/tr1_impl.hpp
    branches/asset-browser/extern/carve/include/carve/collection/unordered/vcpp_impl.hpp
    branches/asset-browser/extern/carve/include/carve/collection/unordered.hpp
    branches/asset-browser/extern/carve/include/carve/collection.hpp
    branches/asset-browser/extern/carve/include/carve/collection_types.hpp
    branches/asset-browser/extern/carve/include/carve/colour.hpp
    branches/asset-browser/extern/carve/include/carve/config.h
    branches/asset-browser/extern/carve/include/carve/convex_hull.hpp
    branches/asset-browser/extern/carve/include/carve/csg.hpp
    branches/asset-browser/extern/carve/include/carve/csg_triangulator.hpp
    branches/asset-browser/extern/carve/include/carve/debug_hooks.hpp
    branches/asset-browser/extern/carve/include/carve/djset.hpp
    branches/asset-browser/extern/carve/include/carve/edge_decl.hpp
    branches/asset-browser/extern/carve/include/carve/edge_impl.hpp
    branches/asset-browser/extern/carve/include/carve/exact.hpp
    branches/asset-browser/extern/carve/include/carve/external/
    branches/asset-browser/extern/carve/include/carve/external/boost/
    branches/asset-browser/extern/carve/include/carve/external/boost/random.hpp
    branches/asset-browser/extern/carve/include/carve/face_decl.hpp
    branches/asset-browser/extern/carve/include/carve/face_impl.hpp
    branches/asset-browser/extern/carve/include/carve/faceloop.hpp
    branches/asset-browser/extern/carve/include/carve/geom.hpp
    branches/asset-browser/extern/carve/include/carve/geom2d.hpp
    branches/asset-browser/extern/carve/include/carve/geom3d.hpp
    branches/asset-browser/extern/carve/include/carve/geom_impl.hpp
    branches/asset-browser/extern/carve/include/carve/gnu_cxx.h
    branches/asset-browser/extern/carve/include/carve/heap.hpp
    branches/asset-browser/extern/carve/include/carve/input.hpp
    branches/asset-browser/extern/carve/include/carve/interpolator.hpp
    branches/asset-browser/extern/carve/include/carve/intersection.hpp
    branches/asset-browser/extern/carve/include/carve/iobj.hpp
    branches/asset-browser/extern/carve/include/carve/kd_node.hpp
    branches/asset-browser/extern/carve/include/carve/math.hpp
    branches/asset-browser/extern/carve/include/carve/math_constants.hpp
    branches/asset-browser/extern/carve/include/carve/matrix.hpp
    branches/asset-browser/extern/carve/include/carve/mesh.hpp
    branches/asset-browser/extern/carve/include/carve/mesh_impl.hpp
    branches/asset-browser/extern/carve/include/carve/mesh_ops.hpp
    branches/asset-browser/extern/carve/include/carve/mesh_simplify.hpp
    branches/asset-browser/extern/carve/include/carve/octree_decl.hpp
    branches/asset-browser/extern/carve/include/carve/octree_impl.hpp
    branches/asset-browser/extern/carve/include/carve/pointset.hpp
    branches/asset-browser/extern/carve/include/carve/pointset_decl.hpp
    branches/asset-browser/extern/carve/include/carve/pointset_impl.hpp
    branches/asset-browser/extern/carve/include/carve/pointset_iter.hpp
    branches/asset-browser/extern/carve/include/carve/poly.hpp
    branches/asset-browser/extern/carve/include/carve/poly_decl.hpp
    branches/asset-browser/extern/carve/include/carve/poly_impl.hpp
    branches/asset-browser/extern/carve/include/carve/polyhedron_base.hpp
    branches/asset-browser/extern/carve/include/carve/polyhedron_decl.hpp
    branches/asset-browser/extern/carve/include/carve/polyhedron_impl.hpp
    branches/asset-browser/extern/carve/include/carve/polyline.hpp
    branches/asset-browser/extern/carve/include/carve/polyline_decl.hpp
    branches/asset-browser/extern/carve/include/carve/polyline_impl.hpp
    branches/asset-browser/extern/carve/include/carve/polyline_iter.hpp
    branches/asset-browser/extern/carve/include/carve/rescale.hpp
    branches/asset-browser/extern/carve/include/carve/rtree.hpp
    branches/asset-browser/extern/carve/include/carve/spacetree.hpp
    branches/asset-browser/extern/carve/include/carve/tag.hpp
    branches/asset-browser/extern/carve/include/carve/timing.hpp
    branches/asset-browser/extern/carve/include/carve/tree.hpp
    branches/asset-browser/extern/carve/include/carve/triangulator.hpp
    branches/asset-browser/extern/carve/include/carve/triangulator_impl.hpp
    branches/asset-browser/extern/carve/include/carve/util.hpp
    branches/asset-browser/extern/carve/include/carve/vcpp_config.h
    branches/asset-browser/extern/carve/include/carve/vector.hpp
    branches/asset-browser/extern/carve/include/carve/vertex_decl.hpp
    branches/asset-browser/extern/carve/include/carve/vertex_impl.hpp
    branches/asset-browser/extern/carve/include/carve/win32.h
    branches/asset-browser/extern/carve/lib/
    branches/asset-browser/extern/carve/lib/aabb.cpp
    branches/asset-browser/extern/carve/lib/carve.cpp
    branches/asset-browser/extern/carve/lib/convex_hull.cpp
    branches/asset-browser/extern/carve/lib/csg.cpp
    branches/asset-browser/extern/carve/lib/csg_collector.cpp
    branches/asset-browser/extern/carve/lib/csg_collector.hpp
    branches/asset-browser/extern/carve/lib/csg_data.hpp
    branches/asset-browser/extern/carve/lib/csg_detail.hpp
    branches/asset-browser/extern/carve/lib/edge.cpp
    branches/asset-browser/extern/carve/lib/face.cpp
    branches/asset-browser/extern/carve/lib/geom2d.cpp
    branches/asset-browser/extern/carve/lib/geom3d.cpp
    branches/asset-browser/extern/carve/lib/intersect.cpp
    branches/asset-browser/extern/carve/lib/intersect_classify_common.hpp
    branches/asset-browser/extern/carve/lib/intersect_classify_common_impl.hpp
    branches/asset-browser/extern/carve/lib/intersect_classify_edge.cpp
    branches/asset-browser/extern/carve/lib/intersect_classify_group.cpp
    branches/asset-browser/extern/carve/lib/intersect_common.hpp
    branches/asset-browser/extern/carve/lib/intersect_debug.cpp
    branches/asset-browser/extern/carve/lib/intersect_debug.hpp
    branches/asset-browser/extern/carve/lib/intersect_face_division.cpp
    branches/asset-browser/extern/carve/lib/intersect_group.cpp
    branches/asset-browser/extern/carve/lib/intersect_half_classify_group.cpp
    branches/asset-browser/extern/carve/lib/intersection.cpp
    branches/asset-browser/extern/carve/lib/math.cpp
    branches/asset-browser/extern/carve/lib/mesh.cpp
    branches/asset-browser/extern/carve/lib/octree.cpp
    branches/asset-browser/extern/carve/lib/pointset.cpp
    branches/asset-browser/extern/carve/lib/polyhedron.cpp
    branches/asset-browser/extern/carve/lib/polyline.cpp
    branches/asset-browser/extern/carve/lib/tag.cpp
    branches/asset-browser/extern/carve/lib/timing.cpp
    branches/asset-browser/extern/carve/lib/triangulator.cpp
    branches/asset-browser/extern/carve/mkfiles.sh
    branches/asset-browser/extern/carve/patches/
    branches/asset-browser/extern/carve/patches/files/
    branches/asset-browser/extern/carve/patches/files/config.h
    branches/asset-browser/extern/carve/patches/files/random.hpp
    branches/asset-browser/extern/carve/patches/gcc46.patch
    branches/asset-browser/extern/carve/patches/includes.patch
    branches/asset-browser/extern/carve/patches/mesh_iterator.patch
    branches/asset-browser/extern/carve/patches/mingw.patch
    branches/asset-browser/extern/carve/patches/series
    branches/asset-browser/extern/carve/patches/strict_flags.patch
    branches/asset-browser/extern/carve/patches/win32.patch
    branches/asset-browser/source/blender/blenkernel/BKE_array_mallocn.h

Property Changed:
----------------
    branches/asset-browser/
    branches/asset-browser/source/blender/editors/space_outliner/


Property changes on: branches/asset-browser
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/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
/trunk/blender:43077-43211
   + /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
/trunk/blender:43077-43602

Modified: branches/asset-browser/CMakeLists.txt
===================================================================
--- branches/asset-browser/CMakeLists.txt	2012-01-22 13:56:39 UTC (rev 43604)
+++ branches/asset-browser/CMakeLists.txt	2012-01-22 14:21:59 UTC (rev 43605)
@@ -156,7 +156,7 @@
 
 if(UNIX AND NOT APPLE)
 	option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)"	ON)
-	option(WITH_X11_XF86VMODE "Enable X11 video mode switching"	OFF)
+	option(WITH_X11_XF86VMODE "Enable X11 video mode switching"	ON)
 	option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
 	option(WITH_XDG_USER_DIRS    "Build with XDG Base Directory Specification (only config and documents for now)" OFF)
 	mark_as_advanced(WITH_XDG_USER_DIRS)
@@ -208,6 +208,9 @@
 # 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)
@@ -300,9 +303,13 @@
 	set(WITH_HEADLESS ON)
 endif()
 
-# auto enable openimageio and boost for cycles
+# auto enable openimageio for cycles
 if(WITH_CYCLES)
 	set(WITH_OPENIMAGEIO ON)
+endif()
+
+# auto enable boost for cycles and carve
+if(WITH_CYCLES OR WITH_CARVE)
 	set(WITH_BOOST ON)
 endif()
 
@@ -461,7 +468,8 @@
 		# use lib dir if available and nothing else specified
 		if(LIBDIR AND NOT FFMPEG)
 			set(FFMPEG ${LIBDIR}/ffmpeg CACHE PATH "FFMPEG Directory")
-			set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale dirac_encoder mp3lame ogg orc-0.4 schroedinger-1.0 theora theoraenc theoradec vorbis vorbisenc vpx x264 xvidcore faad asound CACHE STRING "FFMPEG Libraries")
+			# XXX, some distros might need 'theoraenc theoradec' too
+			set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale dirac_encoder mp3lame ogg orc-0.4 schroedinger-1.0 theora vorbis vorbisenc vpx x264 xvidcore faad asound CACHE STRING "FFMPEG Libraries")
 		else()
 			set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
 			set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
@@ -619,6 +627,10 @@
 	# CLang is the same as GCC for now.
 	elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 		set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
+	# Solaris CC
+	elseif(CMAKE_CXX_COMPILER_ID MATCHES "SunPro") 
+		set(PLATFORM_CFLAGS "-pipe -features=extensions -fPIC -D__FUNCTION__=__func__")
+		
 	# Intel C++ Compiler
 	elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 		# think these next two are broken
@@ -1080,16 +1092,28 @@
 	endif()
 
 	if(WITH_PYTHON)
-		# we use precompiled libraries for py 3.2 and up by default
+		if(NOT WITH_PYTHON_MODULE)
+			# we use precompiled libraries for py 3.2 and up by default
 
-		# normally cached but not since we include them with blender
-		set(PYTHON_VERSION 3.2)
-		set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}")
-		# set(PYTHON_BINARY "${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet
-		set(PYTHON_LIBRARY python${PYTHON_VERSION})
-		set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
-		# set(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
+			# normally cached but not since we include them with blender
+			set(PYTHON_VERSION 3.2)
+			set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}")
+			# set(PYTHON_BINARY "${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet
+			set(PYTHON_LIBRARY python${PYTHON_VERSION})
+			set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
+			# set(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
+		else()
+			# module must be compiled against Python framework
 
+			# normally cached but not since we include them with blender
+			set(PYTHON_VERSION 3.2)
+			set(PYTHON_INCLUDE_DIR "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/include/python${PYTHON_VERSION}m")
+			set(PYTHON_BINARY "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/bin/python${PYTHON_VERSION}")
+			#set(PYTHON_LIBRARY python${PYTHON_VERSION})
+			set(PYTHON_LIBPATH "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config-3.2m")
+			#set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework Python")  # won't  build with this enabled
+		endif()
+		
 		# uncached vars
 		set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
 		set(PYTHON_LIBRARIES  "${PYTHON_LIBRARY}")
@@ -1184,7 +1208,11 @@
 		set(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
 		set(WITH_INPUT_NDOF OFF)  # unsupported
 	endif()
-
+	
+	if(WITH_PYTHON_MODULE)
+		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/python")# force cmake to link right framework
+	endif()
+	
 	if(WITH_OPENCOLLADA)
 		set(OPENCOLLADA ${LIBDIR}/opencollada)
 

Modified: branches/asset-browser/SConstruct
===================================================================
--- branches/asset-browser/SConstruct	2012-01-22 13:56:39 UTC (rev 43604)
+++ branches/asset-browser/SConstruct	2012-01-22 14:21:59 UTC (rev 43605)
@@ -147,9 +147,8 @@
         env.Tool('mstoolkit', [toolpath])
     else:
         env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
-        # xxx commented out, as was supressing warnings under mingw..
-        #if env:
-        #    btools.SetupSpawn(env)
+        if env:
+            btools.SetupSpawn(env)
 else:
     if bitness==64 and platform=='win32':
         env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')

Modified: branches/asset-browser/build_files/cmake/RpmBuild.cmake
===================================================================
--- branches/asset-browser/build_files/cmake/RpmBuild.cmake	2012-01-22 13:56:39 UTC (rev 43604)
+++ branches/asset-browser/build_files/cmake/RpmBuild.cmake	2012-01-22 14:21:59 UTC (rev 43605)
@@ -13,7 +13,7 @@
 
 	if(RPMBUILD)
 		message(STATUS "RPM Build Found: ${RPMBUILD}")
-	else(RPMBUILD) 
+	else() 
 		message(STATUS "RPM Build Not Found (rpmbuild). RPM generation will not be available")
 	endif()
 
@@ -21,6 +21,6 @@
 
 if(RPMBUILD)
 	set(RPMBUILD_FOUND TRUE)
-else(RPMBUILD) 
+else() 
 	set(RPMBUILD_FOUND FALSE)
 endif()
\ No newline at end of file

Modified: branches/asset-browser/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/asset-browser/build_files/cmake/cmake_static_check_cppcheck.py	2012-01-22 13:56:39 UTC (rev 43604)
+++ branches/asset-browser/build_files/cmake/cmake_static_check_cppcheck.py	2012-01-22 14:21:59 UTC (rev 43605)
@@ -37,7 +37,8 @@
 CHECKER_ARGS = [
     # not sure why this is needed, but it is.
     "-I" + os.path.join(project_source_info.SOURCE_DIR, "extern", "glew", "include"),
-
+	"--suppress=*:%s/extern/glew/include/GL/glew.h:241" % project_source_info.SOURCE_DIR,
+    # "--max-configs=1",  # speeds up execution
     #  "--check-config", # when includes are missing
     #  "--enable=all",  # if you want sixty hundred pedantic suggestions
     ]

Modified: branches/asset-browser/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/asset-browser/build_files/cmake/config/blender_lite.cmake	2012-01-22 13:56:39 UTC (rev 43604)
+++ branches/asset-browser/build_files/cmake/config/blender_lite.cmake	2012-01-22 14:21:59 UTC (rev 43605)
@@ -15,6 +15,7 @@
 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_IK_ITASC            OFF CACHE FORCE BOOL)
 set(WITH_IMAGE_CINEON        OFF CACHE FORCE BOOL)
@@ -33,6 +34,7 @@
 set(WITH_MOD_BOOLEAN         OFF CACHE FORCE BOOL)
 set(WITH_MOD_DECIMATE        OFF CACHE FORCE BOOL)
 set(WITH_MOD_FLUID           OFF CACHE FORCE BOOL)
+set(WITH_MOD_REMESH          OFF CACHE FORCE BOOL)
 set(WITH_MOD_SMOKE           OFF CACHE FORCE BOOL)
 set(WITH_MOD_OCEANSIM        OFF CACHE FORCE BOOL)
 set(WITH_AUDASPACE           OFF CACHE FORCE BOOL)
@@ -43,3 +45,4 @@
 set(WITH_RAYOPTIMIZATION     OFF CACHE FORCE BOOL)
 set(WITH_SDL                 OFF CACHE FORCE BOOL)
 set(WITH_X11_XINPUT          OFF CACHE FORCE BOOL)
+set(WITH_X11_XF86VMODE       OFF CACHE FORCE BOOL)

Modified: branches/asset-browser/build_files/cmake/project_info.py
===================================================================
--- branches/asset-browser/build_files/cmake/project_info.py	2012-01-22 13:56:39 UTC (rev 43604)
+++ branches/asset-browser/build_files/cmake/project_info.py	2012-01-22 14:21:59 UTC (rev 43605)
@@ -133,7 +133,7 @@
     """ Extracr includes and defines from cmake.
     """
 
-    def create_eclipse_project(CMAKE_DIR):
+    def create_eclipse_project():
         print("CMAKE_DIR %r" % CMAKE_DIR)
         if sys.platform == "win32":
             cmd = 'cmake "%s" -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR
@@ -145,7 +145,7 @@
     includes = []
     defines = []
 
-    create_eclipse_project(CMAKE_DIR)
+    create_eclipse_project()
 
     from xml.dom.minidom import parse

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list