[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43831] branches/tile: svn merge ^/trunk/ blender -r43091:43824(HEAD)
Dalai Felinto
dfelinto at gmail.com
Thu Feb 2 00:23:06 CET 2012
Revision: 43831
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43831
Author: dfelinto
Date: 2012-02-01 23:22:55 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43091:43824(HEAD)
Conflicted file manually update:
===============================
readfile.c
Note 1:
=======
The Double Edge Mask is not in tile since it's not a simple convert.
The author of this node is aware of it and should have it working there eventually.
(I'm going to add it in COM_Converter.cpp in a next commit)
Note 2:
=======
In COM_compositor.cpp we are passing only "Compositing" instead of what we have in trunk "Compositing 1 Gamma"
If we decide to go with trunk then we need to incorporate the 43283 and 43287 commits.
Something like:
COM_compositor.cpp:51
- editingtree->stats_draw(editingtree->sdh, (char*)"Compositing");
+ char str[128];
+ BLI_snprintf(str, sizeof(str), "Compositing %d %s", curnode, node->name)
+ editingtree->stats_draw(editingtree->sdh, str);
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43091
Modified Paths:
--------------
branches/tile/CMakeLists.txt
branches/tile/SConstruct
branches/tile/build_files/cmake/RpmBuild.cmake
branches/tile/build_files/cmake/cmake_static_check_cppcheck.py
branches/tile/build_files/cmake/config/blender_lite.cmake
branches/tile/build_files/cmake/project_info.py
branches/tile/build_files/cmake/project_source_info.py
branches/tile/build_files/scons/config/freebsd7-config.py
branches/tile/build_files/scons/config/freebsd8-config.py
branches/tile/build_files/scons/config/freebsd9-config.py
branches/tile/build_files/scons/config/linux-config.py
branches/tile/build_files/scons/config/win32-mingw-config.py
branches/tile/build_files/scons/config/win32-vc-config.py
branches/tile/build_files/scons/config/win64-vc-config.py
branches/tile/build_files/scons/tools/Blender.py
branches/tile/build_files/scons/tools/btools.py
branches/tile/doc/python_api/examples/bge.constraints.py
branches/tile/doc/python_api/examples/bge.texture.1.py
branches/tile/doc/python_api/examples/bge.texture.py
branches/tile/doc/python_api/examples/bpy.types.Menu.1.py
branches/tile/doc/python_api/examples/bpy.types.Menu.py
branches/tile/doc/python_api/examples/bpy.types.Operator.4.py
branches/tile/doc/python_api/examples/bpy.types.Operator.5.py
branches/tile/doc/python_api/examples/bpy.types.Panel.1.py
branches/tile/doc/python_api/rst/bge.constraints.rst
branches/tile/doc/python_api/rst/bge.logic.rst
branches/tile/doc/python_api/rst/bge.render.rst
branches/tile/doc/python_api/rst/bge.texture.rst
branches/tile/doc/python_api/rst/bge.types.rst
branches/tile/doc/python_api/rst/info_best_practice.rst
branches/tile/doc/python_api/rst/info_overview.rst
branches/tile/doc/python_api/rst/info_quickstart.rst
branches/tile/doc/python_api/rst/info_tips_and_tricks.rst
branches/tile/extern/CMakeLists.txt
branches/tile/extern/SConscript
branches/tile/extern/libmv/CMakeLists.txt
branches/tile/extern/libmv/SConscript
branches/tile/extern/libmv/bundle.sh
branches/tile/extern/libmv/third_party/glog/src/config.h
branches/tile/extern/libmv/third_party/glog/src/config_linux.h
branches/tile/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
branches/tile/extern/libmv/third_party/glog/src/utilities.cc
branches/tile/intern/boolop/CMakeLists.txt
branches/tile/intern/boolop/SConscript
branches/tile/intern/boolop/intern/BOP_BSPNode.cpp
branches/tile/intern/boolop/intern/BOP_BSPNode.h
branches/tile/intern/boolop/intern/BOP_BSPTree.cpp
branches/tile/intern/boolop/intern/BOP_Edge.cpp
branches/tile/intern/boolop/intern/BOP_Face.h
branches/tile/intern/boolop/intern/BOP_Indexs.h
branches/tile/intern/boolop/intern/BOP_Interface.cpp
branches/tile/intern/boolop/intern/BOP_MathUtils.cpp
branches/tile/intern/boolop/intern/BOP_Merge.h
branches/tile/intern/boolop/intern/BOP_Merge2.h
branches/tile/intern/boolop/intern/BOP_Mesh.h
branches/tile/intern/boolop/intern/BOP_Segment.cpp
branches/tile/intern/boolop/intern/BOP_Segment.h
branches/tile/intern/boolop/intern/BOP_Splitter.cpp
branches/tile/intern/boolop/intern/BOP_Triangulator.cpp
branches/tile/intern/cycles/app/cycles_server.cpp
branches/tile/intern/cycles/app/cycles_test.cpp
branches/tile/intern/cycles/app/cycles_xml.cpp
branches/tile/intern/cycles/blender/CMakeLists.txt
branches/tile/intern/cycles/blender/addon/__init__.py
branches/tile/intern/cycles/blender/addon/engine.py
branches/tile/intern/cycles/blender/addon/enums.py
branches/tile/intern/cycles/blender/addon/properties.py
branches/tile/intern/cycles/blender/addon/ui.py
branches/tile/intern/cycles/blender/blender_object.cpp
branches/tile/intern/cycles/blender/blender_python.cpp
branches/tile/intern/cycles/blender/blender_session.cpp
branches/tile/intern/cycles/blender/blender_session.h
branches/tile/intern/cycles/blender/blender_shader.cpp
branches/tile/intern/cycles/blender/blender_sync.cpp
branches/tile/intern/cycles/blender/blender_sync.h
branches/tile/intern/cycles/bvh/bvh.cpp
branches/tile/intern/cycles/bvh/bvh.h
branches/tile/intern/cycles/bvh/bvh_params.h
branches/tile/intern/cycles/device/device.cpp
branches/tile/intern/cycles/device/device.h
branches/tile/intern/cycles/device/device_cpu.cpp
branches/tile/intern/cycles/device/device_cuda.cpp
branches/tile/intern/cycles/device/device_intern.h
branches/tile/intern/cycles/device/device_memory.h
branches/tile/intern/cycles/device/device_multi.cpp
branches/tile/intern/cycles/device/device_network.cpp
branches/tile/intern/cycles/device/device_opencl.cpp
branches/tile/intern/cycles/kernel/CMakeLists.txt
branches/tile/intern/cycles/kernel/kernel.cl
branches/tile/intern/cycles/kernel/kernel.cpp
branches/tile/intern/cycles/kernel/kernel.cu
branches/tile/intern/cycles/kernel/kernel.h
branches/tile/intern/cycles/kernel/kernel_compat_cpu.h
branches/tile/intern/cycles/kernel/kernel_compat_cuda.h
branches/tile/intern/cycles/kernel/kernel_differential.h
branches/tile/intern/cycles/kernel/kernel_displace.h
branches/tile/intern/cycles/kernel/kernel_emission.h
branches/tile/intern/cycles/kernel/kernel_film.h
branches/tile/intern/cycles/kernel/kernel_light.h
branches/tile/intern/cycles/kernel/kernel_montecarlo.h
branches/tile/intern/cycles/kernel/kernel_object.h
branches/tile/intern/cycles/kernel/kernel_optimized.cpp
branches/tile/intern/cycles/kernel/kernel_path.h
branches/tile/intern/cycles/kernel/kernel_random.h
branches/tile/intern/cycles/kernel/kernel_shader.h
branches/tile/intern/cycles/kernel/kernel_textures.h
branches/tile/intern/cycles/kernel/kernel_types.h
branches/tile/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/tile/intern/cycles/kernel/svm/svm.h
branches/tile/intern/cycles/kernel/svm/svm_image.h
branches/tile/intern/cycles/kernel/svm/svm_musgrave.h
branches/tile/intern/cycles/kernel/svm/svm_types.h
branches/tile/intern/cycles/render/buffers.cpp
branches/tile/intern/cycles/render/buffers.h
branches/tile/intern/cycles/render/film.cpp
branches/tile/intern/cycles/render/film.h
branches/tile/intern/cycles/render/light.cpp
branches/tile/intern/cycles/render/light.h
branches/tile/intern/cycles/render/mesh.cpp
branches/tile/intern/cycles/render/mesh_displace.cpp
branches/tile/intern/cycles/render/nodes.cpp
branches/tile/intern/cycles/render/nodes.h
branches/tile/intern/cycles/render/object.cpp
branches/tile/intern/cycles/render/object.h
branches/tile/intern/cycles/render/scene.h
branches/tile/intern/cycles/render/session.cpp
branches/tile/intern/cycles/render/session.h
branches/tile/intern/cycles/render/shader.cpp
branches/tile/intern/cycles/render/shader.h
branches/tile/intern/cycles/render/svm.cpp
branches/tile/intern/cycles/render/tile.cpp
branches/tile/intern/cycles/util/util_cache.cpp
branches/tile/intern/cycles/util/util_cache.h
branches/tile/intern/cycles/util/util_progress.h
branches/tile/intern/cycles/util/util_types.h
branches/tile/intern/ffmpeg/ffmpeg_compat.h
branches/tile/intern/ghost/GHOST_ISystem.h
branches/tile/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
branches/tile/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
branches/tile/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/tile/intern/ghost/intern/GHOST_NDOFManager.h
branches/tile/intern/ghost/intern/GHOST_System.cpp
branches/tile/intern/ghost/intern/GHOST_System.h
branches/tile/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/tile/intern/ghost/intern/GHOST_SystemX11.cpp
branches/tile/intern/ghost/test/CMakeLists.txt
branches/tile/intern/memutil/MEM_CacheLimiter.h
branches/tile/intern/memutil/MEM_CacheLimiterC-Api.h
branches/tile/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
branches/tile/release/scripts/modules/addon_utils.py
branches/tile/release/scripts/modules/animsys_refactor.py
branches/tile/release/scripts/modules/bpy/utils.py
branches/tile/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/tile/release/scripts/modules/rna_xml.py
branches/tile/release/scripts/presets/ffmpeg/DV.py
branches/tile/release/scripts/presets/ffmpeg/DVD.py
branches/tile/release/scripts/presets/ffmpeg/SVCD.py
branches/tile/release/scripts/presets/ffmpeg/VCD.py
branches/tile/release/scripts/presets/ffmpeg/h264.py
branches/tile/release/scripts/presets/ffmpeg/theora.py
branches/tile/release/scripts/presets/ffmpeg/xvid.py
branches/tile/release/scripts/presets/keyconfig/maya.py
branches/tile/release/scripts/presets/tracking_settings/blurry_footage.py
branches/tile/release/scripts/presets/tracking_settings/default.py
branches/tile/release/scripts/presets/tracking_settings/fast_motion.py
branches/tile/release/scripts/startup/bl_operators/clip.py
branches/tile/release/scripts/startup/bl_operators/mesh.py
branches/tile/release/scripts/startup/bl_operators/object.py
branches/tile/release/scripts/startup/bl_operators/presets.py
branches/tile/release/scripts/startup/bl_operators/wm.py
branches/tile/release/scripts/startup/bl_ui/__init__.py
branches/tile/release/scripts/startup/bl_ui/properties_data_curve.py
branches/tile/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/tile/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/tile/release/scripts/startup/bl_ui/properties_game.py
branches/tile/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/tile/release/scripts/startup/bl_ui/properties_particle.py
branches/tile/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/tile/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/tile/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/tile/release/scripts/startup/bl_ui/properties_render.py
branches/tile/release/scripts/startup/bl_ui/properties_scene.py
branches/tile/release/scripts/startup/bl_ui/properties_texture.py
branches/tile/release/scripts/startup/bl_ui/space_clip.py
branches/tile/release/scripts/startup/bl_ui/space_dopesheet.py
branches/tile/release/scripts/startup/bl_ui/space_graph.py
branches/tile/release/scripts/startup/bl_ui/space_image.py
branches/tile/release/scripts/startup/bl_ui/space_info.py
branches/tile/release/scripts/startup/bl_ui/space_logic.py
branches/tile/release/scripts/startup/bl_ui/space_nla.py
branches/tile/release/scripts/startup/bl_ui/space_node.py
branches/tile/release/scripts/startup/bl_ui/space_sequencer.py
branches/tile/release/scripts/startup/bl_ui/space_time.py
branches/tile/release/scripts/startup/bl_ui/space_userpref.py
branches/tile/release/scripts/startup/bl_ui/space_view3d.py
branches/tile/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/tile/release/scripts/templates/addon_add_object.py
branches/tile/source/blender/avi/intern/endian.c
branches/tile/source/blender/blenfont/BLF_api.h
branches/tile/source/blender/blenfont/intern/blf.c
branches/tile/source/blender/blenfont/intern/blf_lang.c
branches/tile/source/blender/blenkernel/BKE_DerivedMesh.h
branches/tile/source/blender/blenkernel/BKE_anim.h
branches/tile/source/blender/blenkernel/BKE_armature.h
branches/tile/source/blender/blenkernel/BKE_blender.h
branches/tile/source/blender/blenkernel/BKE_brush.h
branches/tile/source/blender/blenkernel/BKE_cloth.h
branches/tile/source/blender/blenkernel/BKE_customdata.h
branches/tile/source/blender/blenkernel/BKE_deform.h
branches/tile/source/blender/blenkernel/BKE_global.h
branches/tile/source/blender/blenkernel/BKE_image.h
branches/tile/source/blender/blenkernel/BKE_lattice.h
branches/tile/source/blender/blenkernel/BKE_main.h
branches/tile/source/blender/blenkernel/BKE_mesh.h
branches/tile/source/blender/blenkernel/BKE_modifier.h
branches/tile/source/blender/blenkernel/BKE_movieclip.h
branches/tile/source/blender/blenkernel/BKE_node.h
branches/tile/source/blender/blenkernel/BKE_sequencer.h
branches/tile/source/blender/blenkernel/BKE_sound.h
branches/tile/source/blender/blenkernel/BKE_text.h
branches/tile/source/blender/blenkernel/BKE_tracking.h
branches/tile/source/blender/blenkernel/BKE_utildefines.h
branches/tile/source/blender/blenkernel/BKE_writeavi.h
branches/tile/source/blender/blenkernel/BKE_writeffmpeg.h
branches/tile/source/blender/blenkernel/BKE_writeframeserver.h
branches/tile/source/blender/blenkernel/CMakeLists.txt
branches/tile/source/blender/blenkernel/intern/DerivedMesh.c
branches/tile/source/blender/blenkernel/intern/anim.c
branches/tile/source/blender/blenkernel/intern/armature.c
branches/tile/source/blender/blenkernel/intern/boids.c
branches/tile/source/blender/blenkernel/intern/brush.c
branches/tile/source/blender/blenkernel/intern/cloth.c
branches/tile/source/blender/blenkernel/intern/colortools.c
branches/tile/source/blender/blenkernel/intern/constraint.c
branches/tile/source/blender/blenkernel/intern/context.c
branches/tile/source/blender/blenkernel/intern/curve.c
branches/tile/source/blender/blenkernel/intern/customdata.c
branches/tile/source/blender/blenkernel/intern/deform.c
branches/tile/source/blender/blenkernel/intern/depsgraph.c
branches/tile/source/blender/blenkernel/intern/displist.c
branches/tile/source/blender/blenkernel/intern/dynamicpaint.c
branches/tile/source/blender/blenkernel/intern/image.c
branches/tile/source/blender/blenkernel/intern/image_gen.c
branches/tile/source/blender/blenkernel/intern/implicit.c
branches/tile/source/blender/blenkernel/intern/ipo.c
branches/tile/source/blender/blenkernel/intern/key.c
branches/tile/source/blender/blenkernel/intern/lattice.c
branches/tile/source/blender/blenkernel/intern/library.c
branches/tile/source/blender/blenkernel/intern/material.c
branches/tile/source/blender/blenkernel/intern/mball.c
branches/tile/source/blender/blenkernel/intern/mesh.c
branches/tile/source/blender/blenkernel/intern/modifier.c
branches/tile/source/blender/blenkernel/intern/movieclip.c
branches/tile/source/blender/blenkernel/intern/multires.c
branches/tile/source/blender/blenkernel/intern/nla.c
branches/tile/source/blender/blenkernel/intern/node.c
branches/tile/source/blender/blenkernel/intern/object.c
branches/tile/source/blender/blenkernel/intern/packedFile.c
branches/tile/source/blender/blenkernel/intern/paint.c
branches/tile/source/blender/blenkernel/intern/particle.c
branches/tile/source/blender/blenkernel/intern/particle_system.c
branches/tile/source/blender/blenkernel/intern/pointcache.c
branches/tile/source/blender/blenkernel/intern/property.c
branches/tile/source/blender/blenkernel/intern/sca.c
branches/tile/source/blender/blenkernel/intern/scene.c
branches/tile/source/blender/blenkernel/intern/seqeffects.c
branches/tile/source/blender/blenkernel/intern/sequencer.c
branches/tile/source/blender/blenkernel/intern/smoke.c
branches/tile/source/blender/blenkernel/intern/softbody.c
branches/tile/source/blender/blenkernel/intern/sound.c
branches/tile/source/blender/blenkernel/intern/subsurf_ccg.c
branches/tile/source/blender/blenkernel/intern/text.c
branches/tile/source/blender/blenkernel/intern/texture.c
branches/tile/source/blender/blenkernel/intern/tracking.c
branches/tile/source/blender/blenkernel/intern/writeavi.c
branches/tile/source/blender/blenkernel/intern/writeffmpeg.c
branches/tile/source/blender/blenkernel/intern/writeframeserver.c
branches/tile/source/blender/blenlib/BLI_array.h
branches/tile/source/blender/blenlib/BLI_editVert.h
branches/tile/source/blender/blenlib/BLI_fnmatch.h
branches/tile/source/blender/blenlib/BLI_math_color.h
branches/tile/source/blender/blenlib/BLI_math_geom.h
branches/tile/source/blender/blenlib/BLI_math_vector.h
branches/tile/source/blender/blenlib/BLI_utildefines.h
branches/tile/source/blender/blenlib/intern/BLI_ghash.c
branches/tile/source/blender/blenlib/intern/BLI_kdtree.c
branches/tile/source/blender/blenlib/intern/boxpack2d.c
branches/tile/source/blender/blenlib/intern/bpath.c
branches/tile/source/blender/blenlib/intern/fileops.c
branches/tile/source/blender/blenlib/intern/math_color.c
branches/tile/source/blender/blenlib/intern/math_color_inline.c
branches/tile/source/blender/blenlib/intern/math_geom.c
branches/tile/source/blender/blenlib/intern/math_matrix.c
branches/tile/source/blender/blenlib/intern/math_rotation.c
branches/tile/source/blender/blenlib/intern/math_vector.c
branches/tile/source/blender/blenlib/intern/math_vector_inline.c
branches/tile/source/blender/blenlib/intern/noise.c
branches/tile/source/blender/blenlib/intern/path_util.c
branches/tile/source/blender/blenlib/intern/storage.c
branches/tile/source/blender/blenloader/BLO_readfile.h
branches/tile/source/blender/blenloader/intern/readfile.c
branches/tile/source/blender/blenloader/intern/writefile.c
branches/tile/source/blender/blenpluginapi/iff.h
branches/tile/source/blender/editors/animation/anim_channels_defines.c
branches/tile/source/blender/editors/animation/anim_channels_edit.c
branches/tile/source/blender/editors/animation/anim_draw.c
branches/tile/source/blender/editors/animation/anim_filter.c
branches/tile/source/blender/editors/animation/anim_ipo_utils.c
branches/tile/source/blender/editors/animation/anim_markers.c
branches/tile/source/blender/editors/animation/anim_ops.c
branches/tile/source/blender/editors/animation/keyframing.c
branches/tile/source/blender/editors/armature/armature_intern.h
branches/tile/source/blender/editors/armature/armature_ops.c
branches/tile/source/blender/editors/armature/editarmature.c
branches/tile/source/blender/editors/armature/editarmature_retarget.c
branches/tile/source/blender/editors/armature/meshlaplacian.c
branches/tile/source/blender/editors/armature/poseSlide.c
branches/tile/source/blender/editors/armature/poselib.c
branches/tile/source/blender/editors/armature/poseobject.c
branches/tile/source/blender/editors/armature/reeb.c
branches/tile/source/blender/editors/curve/curve_intern.h
branches/tile/source/blender/editors/curve/curve_ops.c
branches/tile/source/blender/editors/curve/editcurve.c
branches/tile/source/blender/editors/curve/editfont.c
branches/tile/source/blender/editors/datafiles/Bfont.c
branches/tile/source/blender/editors/gpencil/gpencil_buttons.c
branches/tile/source/blender/editors/gpencil/gpencil_ops.c
branches/tile/source/blender/editors/include/ED_armature.h
branches/tile/source/blender/editors/include/ED_image.h
branches/tile/source/blender/editors/include/ED_mesh.h
branches/tile/source/blender/editors/include/ED_object.h
branches/tile/source/blender/editors/include/ED_uvedit.h
branches/tile/source/blender/editors/include/ED_view3d.h
branches/tile/source/blender/editors/include/UI_interface.h
branches/tile/source/blender/editors/include/UI_interface_icons.h
branches/tile/source/blender/editors/include/UI_resources.h
branches/tile/source/blender/editors/interface/interface.c
branches/tile/source/blender/editors/interface/interface_draw.c
branches/tile/source/blender/editors/interface/interface_handlers.c
branches/tile/source/blender/editors/interface/interface_icons.c
branches/tile/source/blender/editors/interface/interface_intern.h
branches/tile/source/blender/editors/interface/interface_layout.c
branches/tile/source/blender/editors/interface/interface_ops.c
branches/tile/source/blender/editors/interface/interface_panel.c
branches/tile/source/blender/editors/interface/interface_regions.c
branches/tile/source/blender/editors/interface/interface_style.c
branches/tile/source/blender/editors/interface/interface_templates.c
branches/tile/source/blender/editors/interface/interface_widgets.c
branches/tile/source/blender/editors/interface/resources.c
branches/tile/source/blender/editors/interface/view2d.c
branches/tile/source/blender/editors/interface/view2d_ops.c
branches/tile/source/blender/editors/mesh/editmesh.c
branches/tile/source/blender/editors/mesh/editmesh_lib.c
branches/tile/source/blender/editors/mesh/editmesh_loop.c
branches/tile/source/blender/editors/mesh/editmesh_mods.c
branches/tile/source/blender/editors/mesh/editmesh_tools.c
branches/tile/source/blender/editors/mesh/loopcut.c
branches/tile/source/blender/editors/mesh/mesh_data.c
branches/tile/source/blender/editors/mesh/mesh_intern.h
branches/tile/source/blender/editors/mesh/mesh_ops.c
branches/tile/source/blender/editors/metaball/mball_edit.c
branches/tile/source/blender/editors/metaball/mball_intern.h
branches/tile/source/blender/editors/metaball/mball_ops.c
branches/tile/source/blender/editors/object/object_add.c
branches/tile/source/blender/editors/object/object_bake.c
branches/tile/source/blender/editors/object/object_constraint.c
branches/tile/source/blender/editors/object/object_edit.c
branches/tile/source/blender/editors/object/object_group.c
branches/tile/source/blender/editors/object/object_hook.c
branches/tile/source/blender/editors/object/object_intern.h
branches/tile/source/blender/editors/object/object_modifier.c
branches/tile/source/blender/editors/object/object_ops.c
branches/tile/source/blender/editors/object/object_relations.c
branches/tile/source/blender/editors/object/object_select.c
branches/tile/source/blender/editors/object/object_transform.c
branches/tile/source/blender/editors/object/object_vgroup.c
branches/tile/source/blender/editors/physics/particle_edit.c
branches/tile/source/blender/editors/physics/physics_fluid.c
branches/tile/source/blender/editors/physics/physics_intern.h
branches/tile/source/blender/editors/physics/physics_ops.c
branches/tile/source/blender/editors/render/render_internal.c
branches/tile/source/blender/editors/render/render_opengl.c
branches/tile/source/blender/editors/render/render_preview.c
branches/tile/source/blender/editors/render/render_shading.c
branches/tile/source/blender/editors/screen/area.c
branches/tile/source/blender/editors/screen/screen_edit.c
branches/tile/source/blender/editors/screen/screen_ops.c
branches/tile/source/blender/editors/screen/screendump.c
branches/tile/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/tile/source/blender/editors/sculpt_paint/SConscript
branches/tile/source/blender/editors/sculpt_paint/paint_image.c
branches/tile/source/blender/editors/sculpt_paint/paint_intern.h
branches/tile/source/blender/editors/sculpt_paint/paint_ops.c
branches/tile/source/blender/editors/sculpt_paint/paint_stroke.c
branches/tile/source/blender/editors/sculpt_paint/paint_utils.c
branches/tile/source/blender/editors/sculpt_paint/paint_vertex.c
branches/tile/source/blender/editors/sculpt_paint/sculpt.c
branches/tile/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/tile/source/blender/editors/sound/sound_ops.c
branches/tile/source/blender/editors/space_action/action_draw.c
branches/tile/source/blender/editors/space_action/action_ops.c
branches/tile/source/blender/editors/space_buttons/buttons_context.c
branches/tile/source/blender/editors/space_buttons/buttons_header.c
branches/tile/source/blender/editors/space_buttons/buttons_ops.c
branches/tile/source/blender/editors/space_buttons/space_buttons.c
branches/tile/source/blender/editors/space_clip/clip_draw.c
branches/tile/source/blender/editors/space_clip/clip_editor.c
branches/tile/source/blender/editors/space_clip/clip_graph_draw.c
branches/tile/source/blender/editors/space_clip/clip_graph_ops.c
branches/tile/source/blender/editors/space_clip/clip_intern.h
branches/tile/source/blender/editors/space_clip/clip_ops.c
branches/tile/source/blender/editors/space_clip/clip_utils.c
branches/tile/source/blender/editors/space_clip/space_clip.c
branches/tile/source/blender/editors/space_clip/tracking_ops.c
branches/tile/source/blender/editors/space_console/console_ops.c
branches/tile/source/blender/editors/space_console/space_console.c
branches/tile/source/blender/editors/space_file/file_draw.c
branches/tile/source/blender/editors/space_file/file_ops.c
branches/tile/source/blender/editors/space_file/filelist.c
branches/tile/source/blender/editors/space_file/filesel.c
branches/tile/source/blender/editors/space_file/space_file.c
branches/tile/source/blender/editors/space_graph/graph_buttons.c
branches/tile/source/blender/editors/space_graph/graph_draw.c
branches/tile/source/blender/editors/space_graph/graph_edit.c
branches/tile/source/blender/editors/space_graph/graph_ops.c
branches/tile/source/blender/editors/space_graph/graph_select.c
branches/tile/source/blender/editors/space_image/image_buttons.c
branches/tile/source/blender/editors/space_image/image_draw.c
branches/tile/source/blender/editors/space_image/image_intern.h
branches/tile/source/blender/editors/space_image/image_ops.c
branches/tile/source/blender/editors/space_image/space_image.c
branches/tile/source/blender/editors/space_info/info_ops.c
branches/tile/source/blender/editors/space_logic/logic_ops.c
branches/tile/source/blender/editors/space_logic/logic_window.c
branches/tile/source/blender/editors/space_nla/nla_draw.c
branches/tile/source/blender/editors/space_nla/nla_ops.c
branches/tile/source/blender/editors/space_node/drawnode.c
branches/tile/source/blender/editors/space_node/node_draw.c
branches/tile/source/blender/editors/space_node/node_edit.c
branches/tile/source/blender/editors/space_node/node_intern.h
branches/tile/source/blender/editors/space_node/node_ops.c
branches/tile/source/blender/editors/space_node/node_templates.c
branches/tile/source/blender/editors/space_node/space_node.c
branches/tile/source/blender/editors/space_outliner/outliner_draw.c
branches/tile/source/blender/editors/space_outliner/outliner_edit.c
branches/tile/source/blender/editors/space_outliner/outliner_intern.h
branches/tile/source/blender/editors/space_outliner/outliner_ops.c
branches/tile/source/blender/editors/space_outliner/outliner_select.c
branches/tile/source/blender/editors/space_outliner/outliner_tree.c
branches/tile/source/blender/editors/space_outliner/space_outliner.c
branches/tile/source/blender/editors/space_script/script_edit.c
branches/tile/source/blender/editors/space_sequencer/sequencer_add.c
branches/tile/source/blender/editors/space_sequencer/sequencer_draw.c
branches/tile/source/blender/editors/space_sequencer/sequencer_edit.c
branches/tile/source/blender/editors/space_sequencer/sequencer_intern.h
branches/tile/source/blender/editors/space_sequencer/sequencer_ops.c
branches/tile/source/blender/editors/space_sequencer/sequencer_scopes.c
branches/tile/source/blender/editors/space_sequencer/sequencer_select.c
branches/tile/source/blender/editors/space_text/space_text.c
branches/tile/source/blender/editors/space_text/text_draw.c
branches/tile/source/blender/editors/space_text/text_intern.h
branches/tile/source/blender/editors/space_text/text_ops.c
branches/tile/source/blender/editors/space_time/space_time.c
branches/tile/source/blender/editors/space_view3d/drawanimviz.c
branches/tile/source/blender/editors/space_view3d/drawarmature.c
branches/tile/source/blender/editors/space_view3d/drawmesh.c
branches/tile/source/blender/editors/space_view3d/drawobject.c
branches/tile/source/blender/editors/space_view3d/drawvolume.c
branches/tile/source/blender/editors/space_view3d/space_view3d.c
branches/tile/source/blender/editors/space_view3d/view3d_buttons.c
branches/tile/source/blender/editors/space_view3d/view3d_draw.c
branches/tile/source/blender/editors/space_view3d/view3d_edit.c
branches/tile/source/blender/editors/space_view3d/view3d_fly.c
branches/tile/source/blender/editors/space_view3d/view3d_header.c
branches/tile/source/blender/editors/space_view3d/view3d_intern.h
branches/tile/source/blender/editors/space_view3d/view3d_ops.c
branches/tile/source/blender/editors/space_view3d/view3d_select.c
branches/tile/source/blender/editors/space_view3d/view3d_snap.c
branches/tile/source/blender/editors/space_view3d/view3d_toolbar.c
branches/tile/source/blender/editors/space_view3d/view3d_view.c
branches/tile/source/blender/editors/transform/transform.c
branches/tile/source/blender/editors/transform/transform.h
branches/tile/source/blender/editors/transform/transform_constraints.c
branches/tile/source/blender/editors/transform/transform_conversions.c
branches/tile/source/blender/editors/transform/transform_generics.c
branches/tile/source/blender/editors/transform/transform_ops.c
branches/tile/source/blender/editors/transform/transform_orientations.c
branches/tile/source/blender/editors/transform/transform_snap.c
branches/tile/source/blender/editors/util/ed_util.c
branches/tile/source/blender/editors/util/numinput.c
branches/tile/source/blender/editors/util/undo.c
branches/tile/source/blender/editors/uvedit/CMakeLists.txt
branches/tile/source/blender/editors/uvedit/uvedit_draw.c
branches/tile/source/blender/editors/uvedit/uvedit_intern.h
branches/tile/source/blender/editors/uvedit/uvedit_ops.c
branches/tile/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/tile/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/tile/source/blender/gpu/GPU_extensions.h
branches/tile/source/blender/gpu/intern/gpu_codegen.c
branches/tile/source/blender/gpu/intern/gpu_draw.c
branches/tile/source/blender/gpu/intern/gpu_extensions.c
branches/tile/source/blender/gpu/intern/gpu_material.c
branches/tile/source/blender/gpu/intern/gpu_shader_material.glsl
branches/tile/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/tile/source/blender/imbuf/IMB_imbuf.h
branches/tile/source/blender/imbuf/IMB_imbuf_types.h
branches/tile/source/blender/imbuf/intern/IMB_anim.h
branches/tile/source/blender/imbuf/intern/IMB_indexer.h
branches/tile/source/blender/imbuf/intern/anim_movie.c
branches/tile/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/tile/source/blender/imbuf/intern/divers.c
branches/tile/source/blender/imbuf/intern/indexer.c
branches/tile/source/blender/imbuf/intern/moviecache.c
branches/tile/source/blender/imbuf/intern/tiff.c
branches/tile/source/blender/makesdna/DNA_ID.h
branches/tile/source/blender/makesdna/DNA_action_types.h
branches/tile/source/blender/makesdna/DNA_actuator_types.h
branches/tile/source/blender/makesdna/DNA_armature_types.h
branches/tile/source/blender/makesdna/DNA_brush_types.h
branches/tile/source/blender/makesdna/DNA_cloth_types.h
branches/tile/source/blender/makesdna/DNA_constraint_types.h
branches/tile/source/blender/makesdna/DNA_controller_types.h
branches/tile/source/blender/makesdna/DNA_customdata_types.h
branches/tile/source/blender/makesdna/DNA_defs.h
branches/tile/source/blender/makesdna/DNA_dynamicpaint_types.h
branches/tile/source/blender/makesdna/DNA_effect_types.h
branches/tile/source/blender/makesdna/DNA_fileglobal_types.h
branches/tile/source/blender/makesdna/DNA_image_types.h
branches/tile/source/blender/makesdna/DNA_key_types.h
branches/tile/source/blender/makesdna/DNA_lattice_types.h
branches/tile/source/blender/makesdna/DNA_material_types.h
branches/tile/source/blender/makesdna/DNA_meta_types.h
branches/tile/source/blender/makesdna/DNA_modifier_types.h
branches/tile/source/blender/makesdna/DNA_movieclip_types.h
branches/tile/source/blender/makesdna/DNA_node_types.h
branches/tile/source/blender/makesdna/DNA_object_fluidsim.h
branches/tile/source/blender/makesdna/DNA_object_force.h
branches/tile/source/blender/makesdna/DNA_object_types.h
branches/tile/source/blender/makesdna/DNA_particle_types.h
branches/tile/source/blender/makesdna/DNA_property_types.h
branches/tile/source/blender/makesdna/DNA_scene_types.h
branches/tile/source/blender/makesdna/DNA_sensor_types.h
branches/tile/source/blender/makesdna/DNA_sequence_types.h
branches/tile/source/blender/makesdna/DNA_smoke_types.h
branches/tile/source/blender/makesdna/DNA_sound_types.h
branches/tile/source/blender/makesdna/DNA_space_types.h
branches/tile/source/blender/makesdna/DNA_texture_types.h
branches/tile/source/blender/makesdna/DNA_tracking_types.h
branches/tile/source/blender/makesdna/DNA_userdef_types.h
branches/tile/source/blender/makesdna/DNA_vfont_types.h
branches/tile/source/blender/makesdna/DNA_view3d_types.h
branches/tile/source/blender/makesdna/DNA_windowmanager_types.h
branches/tile/source/blender/makesrna/RNA_access.h
branches/tile/source/blender/makesrna/RNA_enum_types.h
branches/tile/source/blender/makesrna/SConscript
branches/tile/source/blender/makesrna/intern/CMakeLists.txt
branches/tile/source/blender/makesrna/intern/SConscript
branches/tile/source/blender/makesrna/intern/rna_access.c
branches/tile/source/blender/makesrna/intern/rna_actuator.c
branches/tile/source/blender/makesrna/intern/rna_brush.c
branches/tile/source/blender/makesrna/intern/rna_cloth.c
branches/tile/source/blender/makesrna/intern/rna_constraint.c
branches/tile/source/blender/makesrna/intern/rna_controller.c
branches/tile/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/tile/source/blender/makesrna/intern/rna_fluidsim.c
branches/tile/source/blender/makesrna/intern/rna_image.c
branches/tile/source/blender/makesrna/intern/rna_key.c
branches/tile/source/blender/makesrna/intern/rna_main.c
branches/tile/source/blender/makesrna/intern/rna_material.c
branches/tile/source/blender/makesrna/intern/rna_mesh.c
branches/tile/source/blender/makesrna/intern/rna_modifier.c
branches/tile/source/blender/makesrna/intern/rna_movieclip.c
branches/tile/source/blender/makesrna/intern/rna_nodetree.c
branches/tile/source/blender/makesrna/intern/rna_nodetree_types.h
branches/tile/source/blender/makesrna/intern/rna_object.c
branches/tile/source/blender/makesrna/intern/rna_object_api.c
branches/tile/source/blender/makesrna/intern/rna_pose.c
branches/tile/source/blender/makesrna/intern/rna_property.c
branches/tile/source/blender/makesrna/intern/rna_render.c
branches/tile/source/blender/makesrna/intern/rna_scene.c
branches/tile/source/blender/makesrna/intern/rna_scene_api.c
branches/tile/source/blender/makesrna/intern/rna_screen.c
branches/tile/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/tile/source/blender/makesrna/intern/rna_sensor.c
branches/tile/source/blender/makesrna/intern/rna_space.c
branches/tile/source/blender/makesrna/intern/rna_tracking.c
branches/tile/source/blender/makesrna/intern/rna_ui.c
branches/tile/source/blender/makesrna/intern/rna_userdef.c
branches/tile/source/blender/makesrna/intern/rna_wm.c
branches/tile/source/blender/modifiers/intern/MOD_armature.c
branches/tile/source/blender/modifiers/intern/MOD_bevel.c
branches/tile/source/blender/modifiers/intern/MOD_boolean.c
branches/tile/source/blender/modifiers/intern/MOD_boolean_util.c
branches/tile/source/blender/modifiers/intern/MOD_build.c
branches/tile/source/blender/modifiers/intern/MOD_cast.c
branches/tile/source/blender/modifiers/intern/MOD_cloth.c
branches/tile/source/blender/modifiers/intern/MOD_curve.c
branches/tile/source/blender/modifiers/intern/MOD_displace.c
branches/tile/source/blender/modifiers/intern/MOD_dynamicpaint.c
branches/tile/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/tile/source/blender/modifiers/intern/MOD_hook.c
branches/tile/source/blender/modifiers/intern/MOD_lattice.c
branches/tile/source/blender/modifiers/intern/MOD_smooth.c
branches/tile/source/blender/modifiers/intern/MOD_solidify.c
branches/tile/source/blender/modifiers/intern/MOD_util.c
branches/tile/source/blender/modifiers/intern/MOD_uvproject.c
branches/tile/source/blender/modifiers/intern/MOD_wave.c
branches/tile/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/tile/source/blender/modifiers/intern/MOD_weightvg_util.h
branches/tile/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/tile/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/tile/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/tile/source/blender/nodes/CMakeLists.txt
branches/tile/source/blender/nodes/NOD_composite.h
branches/tile/source/blender/nodes/NOD_shader.h
branches/tile/source/blender/nodes/NOD_socket.h
branches/tile/source/blender/nodes/composite/node_composite_tree.c
branches/tile/source/blender/nodes/composite/node_composite_util.c
branches/tile/source/blender/nodes/composite/node_composite_util.h
branches/tile/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_image.c
branches/tile/source/blender/nodes/intern/node_common.c
branches/tile/source/blender/nodes/intern/node_socket.c
branches/tile/source/blender/nodes/shader/node_shader_util.c
branches/tile/source/blender/nodes/shader/nodes/node_shader_gamma.c
branches/tile/source/blender/nodes/texture/nodes/node_texture_output.c
branches/tile/source/blender/python/SConscript
branches/tile/source/blender/python/generic/bpy_internal_import.c
branches/tile/source/blender/python/generic/idprop_py_api.c
branches/tile/source/blender/python/intern/CMakeLists.txt
branches/tile/source/blender/python/intern/bpy_interface.c
branches/tile/source/blender/python/intern/bpy_props.c
branches/tile/source/blender/python/intern/bpy_rna.c
branches/tile/source/blender/python/mathutils/mathutils_Matrix.c
branches/tile/source/blender/python/mathutils/mathutils_Vector.c
branches/tile/source/blender/quicktime/apple/qtkit_export.m
branches/tile/source/blender/quicktime/quicktime_export.h
branches/tile/source/blender/render/CMakeLists.txt
branches/tile/source/blender/render/extern/include/RE_pipeline.h
branches/tile/source/blender/render/extern/include/RE_shader_ext.h
branches/tile/source/blender/render/intern/include/render_types.h
branches/tile/source/blender/render/intern/include/renderpipeline.h
branches/tile/source/blender/render/intern/raytrace/rayobject.cpp
branches/tile/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
branches/tile/source/blender/render/intern/raytrace/rayobject_empty.cpp
branches/tile/source/blender/render/intern/raytrace/rayobject_instance.cpp
branches/tile/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/tile/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
branches/tile/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
branches/tile/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
branches/tile/source/blender/render/intern/raytrace/vbvh.h
branches/tile/source/blender/render/intern/source/convertblender.c
branches/tile/source/blender/render/intern/source/external_engine.c
branches/tile/source/blender/render/intern/source/imagetexture.c
branches/tile/source/blender/render/intern/source/occlusion.c
branches/tile/source/blender/render/intern/source/pipeline.c
branches/tile/source/blender/render/intern/source/pixelshading.c
branches/tile/source/blender/render/intern/source/rayshade.c
branches/tile/source/blender/render/intern/source/render_texture.c
branches/tile/source/blender/render/intern/source/rendercore.c
branches/tile/source/blender/render/intern/source/shadbuf.c
branches/tile/source/blender/render/intern/source/shadeinput.c
branches/tile/source/blender/render/intern/source/shadeoutput.c
branches/tile/source/blender/render/intern/source/volumetric.c
branches/tile/source/blender/render/intern/source/zbuf.c
branches/tile/source/blender/windowmanager/WM_api.h
branches/tile/source/blender/windowmanager/WM_types.h
branches/tile/source/blender/windowmanager/intern/wm_dragdrop.c
branches/tile/source/blender/windowmanager/intern/wm_event_system.c
branches/tile/source/blender/windowmanager/intern/wm_files.c
branches/tile/source/blender/windowmanager/intern/wm_init_exit.c
branches/tile/source/blender/windowmanager/intern/wm_jobs.c
branches/tile/source/blender/windowmanager/intern/wm_keymap.c
branches/tile/source/blender/windowmanager/intern/wm_operators.c
branches/tile/source/blenderplayer/CMakeLists.txt
branches/tile/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/tile/source/creator/CMakeLists.txt
branches/tile/source/creator/creator.c
branches/tile/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/tile/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/tile/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/tile/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/tile/source/gameengine/Converter/BL_ActionActuator.cpp
branches/tile/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/tile/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/tile/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/tile/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/tile/source/gameengine/Converter/KX_ConvertProperties.cpp
branches/tile/source/gameengine/Expressions/PyObjectPlus.h
branches/tile/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/tile/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/tile/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/tile/source/gameengine/GameLogic/SCA_KeyboardSensor.h
branches/tile/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/tile/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/tile/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp
branches/tile/source/gameengine/GameLogic/SCA_PythonKeyboard.h
branches/tile/source/gameengine/GameLogic/SCA_PythonMouse.cpp
branches/tile/source/gameengine/GameLogic/SCA_PythonMouse.h
branches/tile/source/gameengine/GameLogic/SCA_RandomActuator.cpp
branches/tile/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/tile/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/tile/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/tile/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/tile/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
branches/tile/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
branches/tile/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/tile/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/tile/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/tile/source/gameengine/Ketsji/KX_CameraActuator.h
branches/tile/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/tile/source/gameengine/Ketsji/KX_FontObject.cpp
branches/tile/source/gameengine/Ketsji/KX_GameObject.cpp
branches/tile/source/gameengine/Ketsji/KX_GameObject.h
branches/tile/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/tile/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/tile/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/tile/source/gameengine/Ketsji/KX_SceneActuator.cpp
branches/tile/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/tile/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/tile/source/gameengine/Rasterizer/RAS_TexVert.cpp
branches/tile/source/gameengine/VideoTexture/blendVideoTex.cpp
Added Paths:
-----------
branches/tile/extern/carve/
branches/tile/extern/carve/CMakeLists.txt
branches/tile/extern/carve/LICENSE.GPL2
branches/tile/extern/carve/SConscript
branches/tile/extern/carve/bundle.sh
branches/tile/extern/carve/files.txt
branches/tile/extern/carve/include/
branches/tile/extern/carve/include/carve/
branches/tile/extern/carve/include/carve/aabb.hpp
branches/tile/extern/carve/include/carve/aabb_impl.hpp
branches/tile/extern/carve/include/carve/carve.hpp
branches/tile/extern/carve/include/carve/cbrt.h
branches/tile/extern/carve/include/carve/classification.hpp
branches/tile/extern/carve/include/carve/collection/
branches/tile/extern/carve/include/carve/collection/unordered/
branches/tile/extern/carve/include/carve/collection/unordered/boost_impl.hpp
branches/tile/extern/carve/include/carve/collection/unordered/fallback_impl.hpp
branches/tile/extern/carve/include/carve/collection/unordered/libstdcpp_impl.hpp
branches/tile/extern/carve/include/carve/collection/unordered/std_impl.hpp
branches/tile/extern/carve/include/carve/collection/unordered/tr1_impl.hpp
branches/tile/extern/carve/include/carve/collection/unordered/vcpp_impl.hpp
branches/tile/extern/carve/include/carve/collection/unordered.hpp
branches/tile/extern/carve/include/carve/collection.hpp
branches/tile/extern/carve/include/carve/collection_types.hpp
branches/tile/extern/carve/include/carve/colour.hpp
branches/tile/extern/carve/include/carve/config.h
branches/tile/extern/carve/include/carve/convex_hull.hpp
branches/tile/extern/carve/include/carve/csg.hpp
branches/tile/extern/carve/include/carve/csg_triangulator.hpp
branches/tile/extern/carve/include/carve/debug_hooks.hpp
branches/tile/extern/carve/include/carve/djset.hpp
branches/tile/extern/carve/include/carve/edge_decl.hpp
branches/tile/extern/carve/include/carve/edge_impl.hpp
branches/tile/extern/carve/include/carve/exact.hpp
branches/tile/extern/carve/include/carve/external/
branches/tile/extern/carve/include/carve/external/boost/
branches/tile/extern/carve/include/carve/external/boost/random.hpp
branches/tile/extern/carve/include/carve/face_decl.hpp
branches/tile/extern/carve/include/carve/face_impl.hpp
branches/tile/extern/carve/include/carve/faceloop.hpp
branches/tile/extern/carve/include/carve/geom.hpp
branches/tile/extern/carve/include/carve/geom2d.hpp
branches/tile/extern/carve/include/carve/geom3d.hpp
branches/tile/extern/carve/include/carve/geom_impl.hpp
branches/tile/extern/carve/include/carve/gnu_cxx.h
branches/tile/extern/carve/include/carve/heap.hpp
branches/tile/extern/carve/include/carve/input.hpp
branches/tile/extern/carve/include/carve/interpolator.hpp
branches/tile/extern/carve/include/carve/intersection.hpp
branches/tile/extern/carve/include/carve/iobj.hpp
branches/tile/extern/carve/include/carve/kd_node.hpp
branches/tile/extern/carve/include/carve/math.hpp
branches/tile/extern/carve/include/carve/math_constants.hpp
branches/tile/extern/carve/include/carve/matrix.hpp
branches/tile/extern/carve/include/carve/mesh.hpp
branches/tile/extern/carve/include/carve/mesh_impl.hpp
branches/tile/extern/carve/include/carve/mesh_ops.hpp
branches/tile/extern/carve/include/carve/mesh_simplify.hpp
branches/tile/extern/carve/include/carve/octree_decl.hpp
branches/tile/extern/carve/include/carve/octree_impl.hpp
branches/tile/extern/carve/include/carve/pointset.hpp
branches/tile/extern/carve/include/carve/pointset_decl.hpp
branches/tile/extern/carve/include/carve/pointset_impl.hpp
branches/tile/extern/carve/include/carve/pointset_iter.hpp
branches/tile/extern/carve/include/carve/poly.hpp
branches/tile/extern/carve/include/carve/poly_decl.hpp
branches/tile/extern/carve/include/carve/poly_impl.hpp
branches/tile/extern/carve/include/carve/polyhedron_base.hpp
branches/tile/extern/carve/include/carve/polyhedron_decl.hpp
branches/tile/extern/carve/include/carve/polyhedron_impl.hpp
branches/tile/extern/carve/include/carve/polyline.hpp
branches/tile/extern/carve/include/carve/polyline_decl.hpp
branches/tile/extern/carve/include/carve/polyline_impl.hpp
branches/tile/extern/carve/include/carve/polyline_iter.hpp
branches/tile/extern/carve/include/carve/rescale.hpp
branches/tile/extern/carve/include/carve/rtree.hpp
branches/tile/extern/carve/include/carve/spacetree.hpp
branches/tile/extern/carve/include/carve/tag.hpp
branches/tile/extern/carve/include/carve/timing.hpp
branches/tile/extern/carve/include/carve/tree.hpp
branches/tile/extern/carve/include/carve/triangulator.hpp
branches/tile/extern/carve/include/carve/triangulator_impl.hpp
branches/tile/extern/carve/include/carve/util.hpp
branches/tile/extern/carve/include/carve/vcpp_config.h
branches/tile/extern/carve/include/carve/vector.hpp
branches/tile/extern/carve/include/carve/vertex_decl.hpp
branches/tile/extern/carve/include/carve/vertex_impl.hpp
branches/tile/extern/carve/include/carve/win32.h
branches/tile/extern/carve/lib/
branches/tile/extern/carve/lib/aabb.cpp
branches/tile/extern/carve/lib/carve.cpp
branches/tile/extern/carve/lib/convex_hull.cpp
branches/tile/extern/carve/lib/csg.cpp
branches/tile/extern/carve/lib/csg_collector.cpp
branches/tile/extern/carve/lib/csg_collector.hpp
branches/tile/extern/carve/lib/csg_data.hpp
branches/tile/extern/carve/lib/csg_detail.hpp
branches/tile/extern/carve/lib/edge.cpp
branches/tile/extern/carve/lib/face.cpp
branches/tile/extern/carve/lib/geom2d.cpp
branches/tile/extern/carve/lib/geom3d.cpp
branches/tile/extern/carve/lib/intersect.cpp
branches/tile/extern/carve/lib/intersect_classify_common.hpp
branches/tile/extern/carve/lib/intersect_classify_common_impl.hpp
branches/tile/extern/carve/lib/intersect_classify_edge.cpp
branches/tile/extern/carve/lib/intersect_classify_group.cpp
branches/tile/extern/carve/lib/intersect_common.hpp
branches/tile/extern/carve/lib/intersect_debug.cpp
branches/tile/extern/carve/lib/intersect_debug.hpp
branches/tile/extern/carve/lib/intersect_face_division.cpp
branches/tile/extern/carve/lib/intersect_group.cpp
branches/tile/extern/carve/lib/intersect_half_classify_group.cpp
branches/tile/extern/carve/lib/intersection.cpp
branches/tile/extern/carve/lib/math.cpp
branches/tile/extern/carve/lib/mesh.cpp
branches/tile/extern/carve/lib/octree.cpp
branches/tile/extern/carve/lib/pointset.cpp
branches/tile/extern/carve/lib/polyhedron.cpp
branches/tile/extern/carve/lib/polyline.cpp
branches/tile/extern/carve/lib/tag.cpp
branches/tile/extern/carve/lib/timing.cpp
branches/tile/extern/carve/lib/triangulator.cpp
branches/tile/extern/carve/mkfiles.sh
branches/tile/extern/carve/patches/
branches/tile/extern/carve/patches/files/
branches/tile/extern/carve/patches/files/config.h
branches/tile/extern/carve/patches/files/random.hpp
branches/tile/extern/carve/patches/gcc46.patch
branches/tile/extern/carve/patches/includes.patch
branches/tile/extern/carve/patches/mesh_iterator.patch
branches/tile/extern/carve/patches/mingw.patch
branches/tile/extern/carve/patches/series
branches/tile/extern/carve/patches/strict_flags.patch
branches/tile/extern/carve/patches/win32.patch
branches/tile/intern/boolop/intern/BOP_CarveInterface.cpp
branches/tile/intern/cycles/blender/CCL_api.h
branches/tile/intern/cycles/kernel/kernel_accumulate.h
branches/tile/intern/cycles/kernel/kernel_passes.h
branches/tile/intern/cycles/kernel/osl/nodes/node_brightness.osl
branches/tile/intern/cycles/kernel/svm/svm_brightness.h
branches/tile/intern/cycles/kernel/svm/svm_checker.h
branches/tile/release/scripts/startup/bl_ui/properties_paint_common.py
branches/tile/source/blender/editors/sculpt_paint/paint_cursor.c
branches/tile/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/tile/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/tile/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
branches/tile/source/blender/nodes/shader/nodes/node_shader_brightness.c
branches/tile/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
branches/tile/source/blender/python/mathutils/mathutils_noise.c
branches/tile/source/blender/render/intern/include/render_result.h
branches/tile/source/blender/render/intern/source/render_result.c
branches/tile/source/tests/bl_mesh_modifiers.py
Removed Paths:
-------------
branches/tile/extern/carve/CMakeLists.txt
branches/tile/extern/carve/LICENSE.GPL2
branches/tile/extern/carve/SConscript
branches/tile/extern/carve/bundle.sh
branches/tile/extern/carve/files.txt
branches/tile/extern/carve/include/
branches/tile/extern/carve/include/carve/
branches/tile/extern/carve/include/carve/aabb.hpp
branches/tile/extern/carve/include/carve/aabb_impl.hpp
branches/tile/extern/carve/include/carve/carve.hpp
branches/tile/extern/carve/include/carve/cbrt.h
branches/tile/extern/carve/include/carve/classification.hpp
branches/tile/extern/carve/include/carve/collection/
branches/tile/extern/carve/include/carve/collection/unordered/
branches/tile/extern/carve/include/carve/collection/unordered/boost_impl.hpp
branches/tile/extern/carve/include/carve/collection/unordered/fallback_impl.hpp
branches/tile/extern/carve/include/carve/collection/unordered/libstdcpp_impl.hpp
branches/tile/extern/carve/include/carve/collection/unordered/std_impl.hpp
branches/tile/extern/carve/include/carve/collection/unordered/tr1_impl.hpp
branches/tile/extern/carve/include/carve/collection/unordered/vcpp_impl.hpp
branches/tile/extern/carve/include/carve/collection/unordered.hpp
branches/tile/extern/carve/include/carve/collection.hpp
branches/tile/extern/carve/include/carve/collection_types.hpp
branches/tile/extern/carve/include/carve/colour.hpp
branches/tile/extern/carve/include/carve/config.h
branches/tile/extern/carve/include/carve/convex_hull.hpp
branches/tile/extern/carve/include/carve/csg.hpp
branches/tile/extern/carve/include/carve/csg_triangulator.hpp
branches/tile/extern/carve/include/carve/debug_hooks.hpp
branches/tile/extern/carve/include/carve/djset.hpp
branches/tile/extern/carve/include/carve/edge_decl.hpp
branches/tile/extern/carve/include/carve/edge_impl.hpp
branches/tile/extern/carve/include/carve/exact.hpp
branches/tile/extern/carve/include/carve/external/
branches/tile/extern/carve/include/carve/external/boost/
branches/tile/extern/carve/include/carve/external/boost/random.hpp
branches/tile/extern/carve/include/carve/face_decl.hpp
branches/tile/extern/carve/include/carve/face_impl.hpp
branches/tile/extern/carve/include/carve/faceloop.hpp
branches/tile/extern/carve/include/carve/geom.hpp
branches/tile/extern/carve/include/carve/geom2d.hpp
branches/tile/extern/carve/include/carve/geom3d.hpp
branches/tile/extern/carve/include/carve/geom_impl.hpp
branches/tile/extern/carve/include/carve/gnu_cxx.h
branches/tile/extern/carve/include/carve/heap.hpp
branches/tile/extern/carve/include/carve/input.hpp
branches/tile/extern/carve/include/carve/interpolator.hpp
branches/tile/extern/carve/include/carve/intersection.hpp
branches/tile/extern/carve/include/carve/iobj.hpp
branches/tile/extern/carve/include/carve/kd_node.hpp
branches/tile/extern/carve/include/carve/math.hpp
branches/tile/extern/carve/include/carve/math_constants.hpp
branches/tile/extern/carve/include/carve/matrix.hpp
branches/tile/extern/carve/include/carve/mesh.hpp
branches/tile/extern/carve/include/carve/mesh_impl.hpp
branches/tile/extern/carve/include/carve/mesh_ops.hpp
branches/tile/extern/carve/include/carve/mesh_simplify.hpp
branches/tile/extern/carve/include/carve/octree_decl.hpp
branches/tile/extern/carve/include/carve/octree_impl.hpp
branches/tile/extern/carve/include/carve/pointset.hpp
branches/tile/extern/carve/include/carve/pointset_decl.hpp
branches/tile/extern/carve/include/carve/pointset_impl.hpp
branches/tile/extern/carve/include/carve/pointset_iter.hpp
branches/tile/extern/carve/include/carve/poly.hpp
branches/tile/extern/carve/include/carve/poly_decl.hpp
branches/tile/extern/carve/include/carve/poly_impl.hpp
branches/tile/extern/carve/include/carve/polyhedron_base.hpp
branches/tile/extern/carve/include/carve/polyhedron_decl.hpp
branches/tile/extern/carve/include/carve/polyhedron_impl.hpp
branches/tile/extern/carve/include/carve/polyline.hpp
branches/tile/extern/carve/include/carve/polyline_decl.hpp
branches/tile/extern/carve/include/carve/polyline_impl.hpp
branches/tile/extern/carve/include/carve/polyline_iter.hpp
branches/tile/extern/carve/include/carve/rescale.hpp
branches/tile/extern/carve/include/carve/rtree.hpp
branches/tile/extern/carve/include/carve/spacetree.hpp
branches/tile/extern/carve/include/carve/tag.hpp
branches/tile/extern/carve/include/carve/timing.hpp
branches/tile/extern/carve/include/carve/tree.hpp
branches/tile/extern/carve/include/carve/triangulator.hpp
branches/tile/extern/carve/include/carve/triangulator_impl.hpp
branches/tile/extern/carve/include/carve/util.hpp
branches/tile/extern/carve/include/carve/vcpp_config.h
branches/tile/extern/carve/include/carve/vector.hpp
branches/tile/extern/carve/include/carve/vertex_decl.hpp
branches/tile/extern/carve/include/carve/vertex_impl.hpp
branches/tile/extern/carve/include/carve/win32.h
branches/tile/extern/carve/lib/
branches/tile/extern/carve/lib/aabb.cpp
branches/tile/extern/carve/lib/carve.cpp
branches/tile/extern/carve/lib/convex_hull.cpp
branches/tile/extern/carve/lib/csg.cpp
branches/tile/extern/carve/lib/csg_collector.cpp
branches/tile/extern/carve/lib/csg_collector.hpp
branches/tile/extern/carve/lib/csg_data.hpp
branches/tile/extern/carve/lib/csg_detail.hpp
branches/tile/extern/carve/lib/edge.cpp
branches/tile/extern/carve/lib/face.cpp
branches/tile/extern/carve/lib/geom2d.cpp
branches/tile/extern/carve/lib/geom3d.cpp
branches/tile/extern/carve/lib/intersect.cpp
branches/tile/extern/carve/lib/intersect_classify_common.hpp
branches/tile/extern/carve/lib/intersect_classify_common_impl.hpp
branches/tile/extern/carve/lib/intersect_classify_edge.cpp
branches/tile/extern/carve/lib/intersect_classify_group.cpp
branches/tile/extern/carve/lib/intersect_common.hpp
branches/tile/extern/carve/lib/intersect_debug.cpp
branches/tile/extern/carve/lib/intersect_debug.hpp
branches/tile/extern/carve/lib/intersect_face_division.cpp
branches/tile/extern/carve/lib/intersect_group.cpp
branches/tile/extern/carve/lib/intersect_half_classify_group.cpp
branches/tile/extern/carve/lib/intersection.cpp
branches/tile/extern/carve/lib/math.cpp
branches/tile/extern/carve/lib/mesh.cpp
branches/tile/extern/carve/lib/octree.cpp
branches/tile/extern/carve/lib/pointset.cpp
branches/tile/extern/carve/lib/polyhedron.cpp
branches/tile/extern/carve/lib/polyline.cpp
branches/tile/extern/carve/lib/tag.cpp
branches/tile/extern/carve/lib/timing.cpp
branches/tile/extern/carve/lib/triangulator.cpp
branches/tile/extern/carve/mkfiles.sh
branches/tile/extern/carve/patches/
branches/tile/extern/carve/patches/files/
branches/tile/extern/carve/patches/files/config.h
branches/tile/extern/carve/patches/files/random.hpp
branches/tile/extern/carve/patches/gcc46.patch
branches/tile/extern/carve/patches/includes.patch
branches/tile/extern/carve/patches/mesh_iterator.patch
branches/tile/extern/carve/patches/mingw.patch
branches/tile/extern/carve/patches/series
branches/tile/extern/carve/patches/strict_flags.patch
branches/tile/extern/carve/patches/win32.patch
branches/tile/source/blender/blenkernel/BKE_array_mallocn.h
branches/tile/source/blender/python/mathutils/mathutils_noise.c
Property Changed:
----------------
branches/tile/
branches/tile/release/scripts/
branches/tile/release/scripts/modules/
branches/tile/release/scripts/presets/
branches/tile/release/scripts/startup/bl_operators/
branches/tile/release/scripts/templates/
branches/tile/source/blender/editors/space_outliner/
Property changes on: branches/tile
___________________________________________________________________
Modified: svn:ignore
- *.pdb
.*
TAGS
build
cscope.out
install
mingw
mingw-user-config.py
mingw-user-config_debug.py
msvc
msvc-user-config.py
obj
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
user-def.mk
graphicall_32b
graphicall_64b
graphicall_64b_debug
installer_32b
installer_64b
+ *.pdb
.*
TAGS
cscope.out
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
CMakeFiles
CMakeCache.txt
blender.bin
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
+ /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38968,38970,38973,39045,40845,43439
/trunk/blender:43091-43829
Modified: branches/tile/CMakeLists.txt
===================================================================
--- branches/tile/CMakeLists.txt 2012-02-01 19:36:39 UTC (rev 43830)
+++ branches/tile/CMakeLists.txt 2012-02-01 23:22:55 UTC (rev 43831)
@@ -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)
@@ -270,8 +273,8 @@
message(FATAL_ERROR "WITH_GHOST_SDL requires WITH_SDL to be ON")
endif()
-if(NOT WITH_IMAGE_OPENJPEG AND WITH_IMAGE_REDCODE)
- message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG")
+if(WITH_IMAGE_REDCODE AND ((NOT WITH_IMAGE_OPENJPEG) OR (NOT WITH_CODEC_FFMPEG)))
+ message(FATAL_ERROR "WITH_IMAGE_REDCODE requires WITH_IMAGE_OPENJPEG and WITH_CODEC_FFMPEG")
endif()
# python module, needs some different options
@@ -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
@@ -711,8 +723,8 @@
add_definitions(/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB)
- set(CMAKE_CXX_FLAGS "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
- set(CMAKE_C_FLAGS "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
+ set(CMAKE_CXX_FLAGS "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
+ set(CMAKE_C_FLAGS "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
if(CMAKE_CL_64)
set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
@@ -1026,9 +1038,13 @@
set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
set(OPENIMAGEIO_DEFINITIONS)
endif()
-
+
set(PLATFORM_LINKFLAGS "-Xlinker --stack=2097152")
+ ## DISABLE - causes linking errors
+ ## for re-distrobution, so users dont need mingw installed
+ # set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-libgcc -static-libstdc++")
+
endif()
# used in many places so include globally, like OpenGL
@@ -1076,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}")
@@ -1180,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/tile/SConstruct
===================================================================
--- branches/tile/SConstruct 2012-02-01 19:36:39 UTC (rev 43830)
+++ branches/tile/SConstruct 2012-02-01 23:22:55 UTC (rev 43831)
@@ -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/tile/build_files/cmake/RpmBuild.cmake
===================================================================
--- branches/tile/build_files/cmake/RpmBuild.cmake 2012-02-01 19:36:39 UTC (rev 43830)
+++ branches/tile/build_files/cmake/RpmBuild.cmake 2012-02-01 23:22:55 UTC (rev 43831)
@@ -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/tile/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/tile/build_files/cmake/cmake_static_check_cppcheck.py 2012-02-01 19:36:39 UTC (rev 43830)
+++ branches/tile/build_files/cmake/cmake_static_check_cppcheck.py 2012-02-01 23:22:55 UTC (rev 43831)
@@ -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/tile/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/tile/build_files/cmake/config/blender_lite.cmake 2012-02-01 19:36:39 UTC (rev 43830)
+++ branches/tile/build_files/cmake/config/blender_lite.cmake 2012-02-01 23:22:55 UTC (rev 43831)
@@ -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)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list