[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43454] branches/soc-2011-onion-uv-tools: merge with trunk 43453

Antony Riakiotakis kalast at gmail.com
Tue Jan 17 17:02:08 CET 2012


Revision: 43454
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43454
Author:   psy-fi
Date:     2012-01-17 16:02:01 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
merge with trunk 43453

Modified Paths:
--------------
    branches/soc-2011-onion-uv-tools/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/SConstruct
    branches/soc-2011-onion-uv-tools/build_files/cmake/config/blender_lite.cmake
    branches/soc-2011-onion-uv-tools/build_files/scons/tools/btools.py
    branches/soc-2011-onion-uv-tools/doc/python_api/examples/bpy.types.Menu.1.py
    branches/soc-2011-onion-uv-tools/doc/python_api/examples/bpy.types.Menu.py
    branches/soc-2011-onion-uv-tools/doc/python_api/examples/bpy.types.Panel.1.py
    branches/soc-2011-onion-uv-tools/extern/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/extern/SConscript
    branches/soc-2011-onion-uv-tools/intern/boolop/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/intern/boolop/SConscript
    branches/soc-2011-onion-uv-tools/intern/boolop/intern/BOP_BSPNode.cpp
    branches/soc-2011-onion-uv-tools/intern/boolop/intern/BOP_BSPNode.h
    branches/soc-2011-onion-uv-tools/intern/boolop/intern/BOP_BSPTree.cpp
    branches/soc-2011-onion-uv-tools/intern/boolop/intern/BOP_Edge.cpp
    branches/soc-2011-onion-uv-tools/intern/boolop/intern/BOP_Face.h
    branches/soc-2011-onion-uv-tools/intern/boolop/intern/BOP_Indexs.h
    branches/soc-2011-onion-uv-tools/intern/boolop/intern/BOP_Interface.cpp
    branches/soc-2011-onion-uv-tools/intern/boolop/intern/BOP_MathUtils.cpp
    branches/soc-2011-onion-uv-tools/intern/boolop/intern/BOP_Merge.h
    branches/soc-2011-onion-uv-tools/intern/boolop/intern/BOP_Merge2.h
    branches/soc-2011-onion-uv-tools/intern/boolop/intern/BOP_Mesh.h
    branches/soc-2011-onion-uv-tools/intern/boolop/intern/BOP_Segment.cpp
    branches/soc-2011-onion-uv-tools/intern/boolop/intern/BOP_Segment.h
    branches/soc-2011-onion-uv-tools/intern/boolop/intern/BOP_Splitter.cpp
    branches/soc-2011-onion-uv-tools/intern/boolop/intern/BOP_Triangulator.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/__init__.py
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/properties.py
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/addon/ui.py
    branches/soc-2011-onion-uv-tools/intern/cycles/blender/blender_sync.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/bvh/bvh.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/bvh/bvh.h
    branches/soc-2011-onion-uv-tools/intern/cycles/bvh/bvh_params.h
    branches/soc-2011-onion-uv-tools/intern/cycles/render/mesh.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/util/util_cache.cpp
    branches/soc-2011-onion-uv-tools/intern/cycles/util/util_cache.h
    branches/soc-2011-onion-uv-tools/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2011-onion-uv-tools/release/scripts/modules/addon_utils.py
    branches/soc-2011-onion-uv-tools/release/scripts/modules/animsys_refactor.py
    branches/soc-2011-onion-uv-tools/release/scripts/presets/keyconfig/maya.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_dopesheet.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_graph.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_nla.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_time.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-onion-uv-tools/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-onion-uv-tools/release/scripts/templates/addon_add_object.py
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_armature.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_brush.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_main.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_movieclip.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_text.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/armature.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/colortools.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/image.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/mesh.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/softbody.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/text.c
    branches/soc-2011-onion-uv-tools/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/BLI_math_color.h
    branches/soc-2011-onion-uv-tools/source/blender/blenlib/intern/math_color.c
    branches/soc-2011-onion-uv-tools/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_markers.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/animation/anim_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/animation/keyframing.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/armature_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/armature_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/armature/editarmature.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/curve/curve_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/curve/curve_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/curve/editcurve.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/gpencil/gpencil_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/include/ED_view3d.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_layout.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/interface/view2d_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/metaball/mball_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/metaball/mball_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/metaball/mball_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_add.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/object/object_select.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/physics/particle_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/physics/physics_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/physics/physics_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/render/render_opengl.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/screen/screen_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/sculpt_paint/sculpt_uv.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_action/action_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_editor.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_clip/space_clip.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_console/console_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_console/space_console.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_file/space_file.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_graph/graph_select.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_image/space_image.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_nla/nla_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_node/node_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/outliner_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_sequencer/sequencer_scopes.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_text/space_text.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_text/text_draw.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_text/text_intern.h
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_text/text_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/transform/transform_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_dynamicpaint_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_image_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_meta_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_movieclip_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_object_force.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_sound_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_space_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/RNA_access.h
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_fluidsim.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_main.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-onion-uv-tools/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-onion-uv-tools/source/blender/modifiers/intern/MOD_boolean.c
    branches/soc-2011-onion-uv-tools/source/blender/nodes/intern/node_common.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_interface.c
    branches/soc-2011-onion-uv-tools/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-onion-uv-tools/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/raytrace/rayobject.cpp
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/raytrace/rayobject_empty.cpp
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/raytrace/rayobject_instance.cpp
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/raytrace/vbvh.h
    branches/soc-2011-onion-uv-tools/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_dragdrop.c
    branches/soc-2011-onion-uv-tools/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-onion-uv-tools/source/blenderplayer/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/creator/CMakeLists.txt
    branches/soc-2011-onion-uv-tools/source/creator/creator.c
    branches/soc-2011-onion-uv-tools/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_ILogicBrick.h
    branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/soc-2011-onion-uv-tools/source/gameengine/Rasterizer/RAS_TexVert.cpp
    branches/soc-2011-onion-uv-tools/source/tests/bl_mesh_modifiers.py

Added Paths:
-----------
    branches/soc-2011-onion-uv-tools/extern/carve/
    branches/soc-2011-onion-uv-tools/extern/carve/include/
    branches/soc-2011-onion-uv-tools/extern/carve/include/carve/
    branches/soc-2011-onion-uv-tools/extern/carve/include/carve/collection/
    branches/soc-2011-onion-uv-tools/extern/carve/include/carve/collection/unordered/
    branches/soc-2011-onion-uv-tools/extern/carve/include/carve/external/
    branches/soc-2011-onion-uv-tools/extern/carve/include/carve/external/boost/
    branches/soc-2011-onion-uv-tools/extern/carve/lib/
    branches/soc-2011-onion-uv-tools/extern/carve/patches/
    branches/soc-2011-onion-uv-tools/extern/carve/patches/files/

Removed Paths:
-------------
    branches/soc-2011-onion-uv-tools/extern/carve/include/
    branches/soc-2011-onion-uv-tools/extern/carve/include/carve/
    branches/soc-2011-onion-uv-tools/extern/carve/include/carve/collection/
    branches/soc-2011-onion-uv-tools/extern/carve/include/carve/collection/unordered/
    branches/soc-2011-onion-uv-tools/extern/carve/include/carve/external/
    branches/soc-2011-onion-uv-tools/extern/carve/include/carve/external/boost/
    branches/soc-2011-onion-uv-tools/extern/carve/lib/
    branches/soc-2011-onion-uv-tools/extern/carve/patches/
    branches/soc-2011-onion-uv-tools/extern/carve/patches/files/

Property Changed:
----------------
    branches/soc-2011-onion-uv-tools/
    branches/soc-2011-onion-uv-tools/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-onion-uv-tools
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,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:39665-43359
   + /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,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:39665-43453

Modified: branches/soc-2011-onion-uv-tools/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion-uv-tools/CMakeLists.txt	2012-01-17 15:19:11 UTC (rev 43453)
+++ branches/soc-2011-onion-uv-tools/CMakeLists.txt	2012-01-17 16:02:01 UTC (rev 43454)
@@ -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()
 
@@ -1085,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}")
@@ -1189,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/soc-2011-onion-uv-tools/SConstruct
===================================================================
--- branches/soc-2011-onion-uv-tools/SConstruct	2012-01-17 15:19:11 UTC (rev 43453)
+++ branches/soc-2011-onion-uv-tools/SConstruct	2012-01-17 16:02:01 UTC (rev 43454)
@@ -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/soc-2011-onion-uv-tools/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/cmake/config/blender_lite.cmake	2012-01-17 15:19:11 UTC (rev 43453)
+++ branches/soc-2011-onion-uv-tools/build_files/cmake/config/blender_lite.cmake	2012-01-17 16:02:01 UTC (rev 43454)
@@ -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/soc-2011-onion-uv-tools/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-onion-uv-tools/build_files/scons/tools/btools.py	2012-01-17 15:19:11 UTC (rev 43453)
+++ branches/soc-2011-onion-uv-tools/build_files/scons/tools/btools.py	2012-01-17 16:02:01 UTC (rev 43454)
@@ -161,7 +161,7 @@
             'WITH_BF_CYCLES', 'WITH_BF_CYCLES_CUDA_BINARIES' 'BF_CYCLES_CUDA_NVCC', 'BF_CYCLES_CUDA_NVCC', 'WITH_BF_CYCLES_CUDA_THREADED_COMPILE',
             'WITH_BF_OIIO', 'WITH_BF_STATICOIIO', 'BF_OIIO', 'BF_OIIO_INC', 'BF_OIIO_LIB', 'BF_OIIO_LIB_STATIC', 'BF_OIIO_LIBPATH',
             'WITH_BF_BOOST', 'WITH_BF_STATICBOOST', 'BF_BOOST', 'BF_BOOST_INC', 'BF_BOOST_LIB', 'BF_BOOST_LIB_STATIC', 'BF_BOOST_LIBPATH',
-            'WITH_BF_LIBMV'
+            'WITH_BF_LIBMV', 'WITH_BF_CARVE'
             ]
     
     # Have options here that scons expects to be lists
@@ -222,15 +222,15 @@
         newargs = string.join(args[1:], ' ')
         cmdline = cmd + " " + newargs
         startupinfo = subprocess.STARTUPINFO()
-        startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
+        #startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
         proc = subprocess.Popen(cmdline, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
             stderr=subprocess.PIPE, startupinfo=startupinfo, shell = False)
         data, err = proc.communicate()
         rv = proc.wait()
-        if rv:
-            print "====="
-            print err
-            print "====="
+        if data:
+            print(data)
+        if err:
+            print(err)
         return rv
 
 def SetupSpawn( env ):
@@ -521,6 +521,7 @@
         
         (BoolVariable('WITH_BF_LZO', 'Enable fast LZO pointcache compression', True)),
         (BoolVariable('WITH_BF_LZMA', 'Enable best LZMA pointcache compression', True)),
+        (BoolVariable('WITH_BF_CARVE', 'Enable carve library for mesh boolean operations', True)),
         
         (BoolVariable('WITH_BF_LIBMV', 'Enable libmv structure from motion library', True)),
 

Modified: branches/soc-2011-onion-uv-tools/doc/python_api/examples/bpy.types.Menu.1.py
===================================================================
--- branches/soc-2011-onion-uv-tools/doc/python_api/examples/bpy.types.Menu.1.py	2012-01-17 15:19:11 UTC (rev 43453)
+++ branches/soc-2011-onion-uv-tools/doc/python_api/examples/bpy.types.Menu.1.py	2012-01-17 16:02:01 UTC (rev 43454)
@@ -13,8 +13,8 @@
     def draw(self, context):
         layout = self.layout
 
-        layout.operator("object.select_all", text="Select/Deselect All")
-        layout.operator("object.select_inverse", text="Inverse")
+        layout.operator("object.select_all", text="Select/Deselect All").action = 'TOGGLE'
+        layout.operator("object.select_all", text="Inverse").action = 'INVERT'
         layout.operator("object.select_random", text="Random")
 
         # access this operator as a submenu

Modified: branches/soc-2011-onion-uv-tools/doc/python_api/examples/bpy.types.Menu.py
===================================================================
--- branches/soc-2011-onion-uv-tools/doc/python_api/examples/bpy.types.Menu.py	2012-01-17 15:19:11 UTC (rev 43453)
+++ branches/soc-2011-onion-uv-tools/doc/python_api/examples/bpy.types.Menu.py	2012-01-17 16:02:01 UTC (rev 43454)
@@ -27,8 +27,8 @@
     def draw(self, context):
         layout = self.layout
 
-        layout.operator("object.select_all", text="Select/Deselect All")
-        layout.operator("object.select_inverse", text="Inverse")
+        layout.operator("object.select_all", text="Select/Deselect All").action = 'TOGGLE'
+        layout.operator("object.select_all", text="Inverse").action = 'INVERT'
         layout.operator("object.select_random", text="Random")
 
 

Modified: branches/soc-2011-onion-uv-tools/doc/python_api/examples/bpy.types.Panel.1.py
===================================================================

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list