[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61240] branches/soc-2013-sketch_mesh: svn merge ^/trunk/blender 60972:61239
Alexander Pinzon
apinzonf at gmail.com
Tue Nov 12 21:30:27 CET 2013
Revision: 61240
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61240
Author: apinzonf
Date: 2013-11-12 20:30:26 +0000 (Tue, 12 Nov 2013)
Log Message:
-----------
svn merge ^/trunk/blender 60972:61239
Modified Paths:
--------------
branches/soc-2013-sketch_mesh/CMakeLists.txt
branches/soc-2013-sketch_mesh/SConstruct
branches/soc-2013-sketch_mesh/build_files/build_environment/install_deps.sh
branches/soc-2013-sketch_mesh/build_files/buildbot/config/user-config-mac-i386.py
branches/soc-2013-sketch_mesh/build_files/buildbot/config/user-config-mac-x86_64.py
branches/soc-2013-sketch_mesh/build_files/cmake/buildinfo.cmake
branches/soc-2013-sketch_mesh/build_files/cmake/macros.cmake
branches/soc-2013-sketch_mesh/build_files/scons/config/darwin-config.py
branches/soc-2013-sketch_mesh/build_files/scons/config/freebsd8-config.py
branches/soc-2013-sketch_mesh/build_files/scons/config/linux-config.py
branches/soc-2013-sketch_mesh/build_files/scons/config/linuxcross-config.py
branches/soc-2013-sketch_mesh/build_files/scons/config/win32-mingw-config.py
branches/soc-2013-sketch_mesh/build_files/scons/config/win32-vc-config.py
branches/soc-2013-sketch_mesh/build_files/scons/config/win64-mingw-config.py
branches/soc-2013-sketch_mesh/build_files/scons/tools/Blender.py
branches/soc-2013-sketch_mesh/build_files/scons/tools/btools.py
branches/soc-2013-sketch_mesh/extern/bullet2/readme.txt
branches/soc-2013-sketch_mesh/extern/libmv/libmv/tracking/track_region.cc
branches/soc-2013-sketch_mesh/extern/libmv/libmv/tracking/track_region.h
branches/soc-2013-sketch_mesh/extern/libmv/libmv-capi.cc
branches/soc-2013-sketch_mesh/extern/libmv/third_party/ceres/SConscript
branches/soc-2013-sketch_mesh/extern/libmv/third_party/ceres/bundle.sh
branches/soc-2013-sketch_mesh/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2013-sketch_mesh/intern/audaspace/intern/AUD_AnimateableProperty.cpp
branches/soc-2013-sketch_mesh/intern/audaspace/intern/AUD_AnimateableProperty.h
branches/soc-2013-sketch_mesh/intern/cycles/blender/addon/properties.py
branches/soc-2013-sketch_mesh/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-sketch_mesh/intern/cycles/kernel/svm/svm_fresnel.h
branches/soc-2013-sketch_mesh/intern/cycles/render/graph.h
branches/soc-2013-sketch_mesh/intern/cycles/render/nodes.cpp
branches/soc-2013-sketch_mesh/intern/cycles/render/sky_model.h
branches/soc-2013-sketch_mesh/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2013-sketch_mesh/intern/ghost/CMakeLists.txt
branches/soc-2013-sketch_mesh/intern/ghost/SConscript
branches/soc-2013-sketch_mesh/intern/ghost/intern/GHOST_ISystem.cpp
branches/soc-2013-sketch_mesh/intern/ghost/intern/GHOST_ISystemPaths.cpp
branches/soc-2013-sketch_mesh/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2013-sketch_mesh/intern/guardedalloc/CMakeLists.txt
branches/soc-2013-sketch_mesh/intern/locale/CMakeLists.txt
branches/soc-2013-sketch_mesh/intern/locale/SConscript
branches/soc-2013-sketch_mesh/intern/rigidbody/CMakeLists.txt
branches/soc-2013-sketch_mesh/intern/tools/credits_svn_gen.py
branches/soc-2013-sketch_mesh/release/bin/blender-softwaregl
branches/soc-2013-sketch_mesh/release/datafiles/blender_icons.svg
branches/soc-2013-sketch_mesh/release/datafiles/blender_icons16.png
branches/soc-2013-sketch_mesh/release/datafiles/blender_icons32.png
branches/soc-2013-sketch_mesh/release/scripts/modules/animsys_refactor.py
branches/soc-2013-sketch_mesh/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
branches/soc-2013-sketch_mesh/release/scripts/modules/bl_i18n_utils/settings.py
branches/soc-2013-sketch_mesh/release/scripts/modules/bl_i18n_utils/utils.py
branches/soc-2013-sketch_mesh/release/scripts/modules/bpy_extras/keyconfig_utils.py
branches/soc-2013-sketch_mesh/release/scripts/modules/bpy_extras/object_utils.py
branches/soc-2013-sketch_mesh/release/scripts/modules/sys_info.py
branches/soc-2013-sketch_mesh/release/scripts/presets/keyconfig/maya.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_operators/anim.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_operators/node.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_operators/presets.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_operators/view3d.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_ui/space_graph.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_ui/space_info.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_ui/space_node.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2013-sketch_mesh/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-sketch_mesh/release/scripts/templates_py/custom_nodes.py
branches/soc-2013-sketch_mesh/release/scripts/templates_py/operator_modal_timer.py
branches/soc-2013-sketch_mesh/source/blender/blenfont/intern/blf_font.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-sketch_mesh/source/blender/blenkernel/BKE_cdderivedmesh.h
branches/soc-2013-sketch_mesh/source/blender/blenkernel/BKE_global.h
branches/soc-2013-sketch_mesh/source/blender/blenkernel/BKE_main.h
branches/soc-2013-sketch_mesh/source/blender/blenkernel/BKE_mask.h
branches/soc-2013-sketch_mesh/source/blender/blenkernel/BKE_modifier.h
branches/soc-2013-sketch_mesh/source/blender/blenkernel/BKE_node.h
branches/soc-2013-sketch_mesh/source/blender/blenkernel/BKE_rigidbody.h
branches/soc-2013-sketch_mesh/source/blender/blenkernel/BKE_writeffmpeg.h
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/anim.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/armature.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/brush.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/cloth.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/constraint.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/curve.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/fcurve.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/gpencil.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/image.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/mask.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/node.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/object.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/particle_system.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/rigidbody.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/scene.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/unit.c
branches/soc-2013-sketch_mesh/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/BLI_rect.h
branches/soc-2013-sketch_mesh/source/blender/blenlib/BLI_utildefines.h
branches/soc-2013-sketch_mesh/source/blender/blenlib/BLI_voronoi.h
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/edgehash.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/rct.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/threads.c
branches/soc-2013-sketch_mesh/source/blender/blenlib/intern/voronoi.c
branches/soc-2013-sketch_mesh/source/blender/blenloader/CMakeLists.txt
branches/soc-2013-sketch_mesh/source/blender/blenloader/SConscript
branches/soc-2013-sketch_mesh/source/blender/blenloader/intern/readfile.c
branches/soc-2013-sketch_mesh/source/blender/blenloader/intern/versioning_250.c
branches/soc-2013-sketch_mesh/source/blender/blenloader/intern/writefile.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/intern/bmesh_operators.h
branches/soc-2013-sketch_mesh/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-sketch_mesh/source/blender/bmesh/operators/bmo_bevel.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/operators/bmo_fill_grid.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/operators/bmo_triangulate.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/operators/bmo_wireframe.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/tools/bmesh_beautify.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/tools/bmesh_beautify.h
branches/soc-2013-sketch_mesh/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/tools/bmesh_bevel.h
branches/soc-2013-sketch_mesh/source/blender/bmesh/tools/bmesh_triangulate.c
branches/soc-2013-sketch_mesh/source/blender/bmesh/tools/bmesh_triangulate.h
branches/soc-2013-sketch_mesh/source/blender/collada/AnimationExporter.h
branches/soc-2013-sketch_mesh/source/blender/collada/ArmatureImporter.cpp
branches/soc-2013-sketch_mesh/source/blender/collada/DocumentExporter.cpp
branches/soc-2013-sketch_mesh/source/blender/collada/collada_utils.cpp
branches/soc-2013-sketch_mesh/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
branches/soc-2013-sketch_mesh/source/blender/compositor/nodes/COM_DespeckleNode.cpp
branches/soc-2013-sketch_mesh/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
branches/soc-2013-sketch_mesh/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
branches/soc-2013-sketch_mesh/source/blender/compositor/operations/COM_DespeckleOperation.cpp
branches/soc-2013-sketch_mesh/source/blender/compositor/operations/COM_DespeckleOperation.h
branches/soc-2013-sketch_mesh/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/soc-2013-sketch_mesh/source/blender/editors/animation/anim_draw.c
branches/soc-2013-sketch_mesh/source/blender/editors/animation/anim_filter.c
branches/soc-2013-sketch_mesh/source/blender/editors/animation/anim_markers.c
branches/soc-2013-sketch_mesh/source/blender/editors/animation/drivers.c
branches/soc-2013-sketch_mesh/source/blender/editors/armature/armature_edit.c
branches/soc-2013-sketch_mesh/source/blender/editors/armature/armature_intern.h
branches/soc-2013-sketch_mesh/source/blender/editors/armature/armature_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/armature/armature_select.c
branches/soc-2013-sketch_mesh/source/blender/editors/armature/armature_utils.c
branches/soc-2013-sketch_mesh/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2013-sketch_mesh/source/blender/editors/armature/pose_lib.c
branches/soc-2013-sketch_mesh/source/blender/editors/armature/pose_slide.c
branches/soc-2013-sketch_mesh/source/blender/editors/curve/editcurve.c
branches/soc-2013-sketch_mesh/source/blender/editors/curve/editcurve_add.c
branches/soc-2013-sketch_mesh/source/blender/editors/curve/editfont.c
branches/soc-2013-sketch_mesh/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2013-sketch_mesh/source/blender/editors/include/ED_anim_api.h
branches/soc-2013-sketch_mesh/source/blender/editors/include/ED_armature.h
branches/soc-2013-sketch_mesh/source/blender/editors/include/ED_node.h
branches/soc-2013-sketch_mesh/source/blender/editors/include/ED_render.h
branches/soc-2013-sketch_mesh/source/blender/editors/interface/interface.c
branches/soc-2013-sketch_mesh/source/blender/editors/interface/interface_eyedropper.c
branches/soc-2013-sketch_mesh/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-sketch_mesh/source/blender/editors/interface/interface_layout.c
branches/soc-2013-sketch_mesh/source/blender/editors/interface/interface_regions.c
branches/soc-2013-sketch_mesh/source/blender/editors/interface/interface_templates.c
branches/soc-2013-sketch_mesh/source/blender/editors/interface/resources.c
branches/soc-2013-sketch_mesh/source/blender/editors/interface/view2d_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/mask/mask_add.c
branches/soc-2013-sketch_mesh/source/blender/editors/mask/mask_shapekey.c
branches/soc-2013-sketch_mesh/source/blender/editors/mesh/editmesh_bevel.c
branches/soc-2013-sketch_mesh/source/blender/editors/mesh/editmesh_inset.c
branches/soc-2013-sketch_mesh/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-sketch_mesh/source/blender/editors/mesh/editmesh_knife_project.c
branches/soc-2013-sketch_mesh/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2013-sketch_mesh/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-sketch_mesh/source/blender/editors/mesh/mesh_data.c
branches/soc-2013-sketch_mesh/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-sketch_mesh/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/mesh/meshtools.c
branches/soc-2013-sketch_mesh/source/blender/editors/metaball/mball_edit.c
branches/soc-2013-sketch_mesh/source/blender/editors/object/object_add.c
branches/soc-2013-sketch_mesh/source/blender/editors/object/object_bake.c
branches/soc-2013-sketch_mesh/source/blender/editors/object/object_constraint.c
branches/soc-2013-sketch_mesh/source/blender/editors/object/object_lattice.c
branches/soc-2013-sketch_mesh/source/blender/editors/object/object_modifier.c
branches/soc-2013-sketch_mesh/source/blender/editors/physics/particle_edit.c
branches/soc-2013-sketch_mesh/source/blender/editors/render/SConscript
branches/soc-2013-sketch_mesh/source/blender/editors/render/render_internal.c
branches/soc-2013-sketch_mesh/source/blender/editors/render/render_opengl.c
branches/soc-2013-sketch_mesh/source/blender/editors/render/render_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/screen/screen_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/screen/screendump.c
branches/soc-2013-sketch_mesh/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2013-sketch_mesh/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2013-sketch_mesh/source/blender/editors/sculpt_paint/paint_mask.c
branches/soc-2013-sketch_mesh/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-sketch_mesh/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-sketch_mesh/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-sketch_mesh/source/blender/editors/sound/SConscript
branches/soc-2013-sketch_mesh/source/blender/editors/sound/sound_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_action/space_action.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_clip/clip_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_console/console_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_file/file_draw.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_file/filelist.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_file/fsmenu.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_graph/graph_draw.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_graph/graph_edit.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_graph/graph_select.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_image/image_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_image/space_image.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_info/space_info.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_nla/space_nla.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_node/drawnode.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_node/node_draw.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_node/node_edit.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_node/node_intern.h
branches/soc-2013-sketch_mesh/source/blender/editors/space_node/node_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_node/node_relationships.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_node/node_select.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_node/node_view.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_sequencer/sequencer_view.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_text/text_autocomplete.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_text/text_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_view3d/view3d_ruler.c
branches/soc-2013-sketch_mesh/source/blender/editors/transform/transform.c
branches/soc-2013-sketch_mesh/source/blender/editors/transform/transform.h
branches/soc-2013-sketch_mesh/source/blender/editors/transform/transform_constraints.c
branches/soc-2013-sketch_mesh/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-sketch_mesh/source/blender/editors/transform/transform_generics.c
branches/soc-2013-sketch_mesh/source/blender/editors/transform/transform_ops.c
branches/soc-2013-sketch_mesh/source/blender/editors/transform/transform_snap.c
branches/soc-2013-sketch_mesh/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2013-sketch_mesh/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/geometry/Grid.h
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/python/BPy_Convert.cpp
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/python/BPy_Convert.h
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/python/Director.cpp
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/python/Interface1D/BPy_FrsCurve.cpp
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/stroke/Curve.h
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/stroke/Stroke.h
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/system/Id.h
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/system/TimeUtils.h
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/view_map/SteerableViewMap.h
branches/soc-2013-sketch_mesh/source/blender/freestyle/intern/view_map/ViewMap.h
branches/soc-2013-sketch_mesh/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2013-sketch_mesh/source/blender/imbuf/intern/cineon/cineonlib.c
branches/soc-2013-sketch_mesh/source/blender/imbuf/intern/cineon/dpxlib.c
branches/soc-2013-sketch_mesh/source/blender/imbuf/intern/util.c
branches/soc-2013-sketch_mesh/source/blender/makesdna/DNA_anim_types.h
branches/soc-2013-sketch_mesh/source/blender/makesdna/DNA_fileglobal_types.h
branches/soc-2013-sketch_mesh/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2013-sketch_mesh/source/blender/makesdna/DNA_node_types.h
branches/soc-2013-sketch_mesh/source/blender/makesdna/DNA_scene_types.h
branches/soc-2013-sketch_mesh/source/blender/makesdna/DNA_space_types.h
branches/soc-2013-sketch_mesh/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2013-sketch_mesh/source/blender/makesrna/RNA_access.h
branches/soc-2013-sketch_mesh/source/blender/makesrna/RNA_enum_types.h
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_access.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_curve.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_mask.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_wm.c
branches/soc-2013-sketch_mesh/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2013-sketch_mesh/source/blender/modifiers/intern/MOD_triangulate.c
branches/soc-2013-sketch_mesh/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/soc-2013-sketch_mesh/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2013-sketch_mesh/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/soc-2013-sketch_mesh/source/blender/nodes/composite/nodes/node_composite_switch.c
branches/soc-2013-sketch_mesh/source/blender/nodes/intern/node_common.c
branches/soc-2013-sketch_mesh/source/blender/nodes/intern/node_common.h
branches/soc-2013-sketch_mesh/source/blender/nodes/intern/node_exec.c
branches/soc-2013-sketch_mesh/source/blender/nodes/intern/node_exec.h
branches/soc-2013-sketch_mesh/source/blender/nodes/intern/node_util.c
branches/soc-2013-sketch_mesh/source/blender/nodes/intern/node_util.h
branches/soc-2013-sketch_mesh/source/blender/nodes/shader/nodes/node_shader_common.c
branches/soc-2013-sketch_mesh/source/blender/nodes/shader/nodes/node_shader_fresnel.c
branches/soc-2013-sketch_mesh/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2013-sketch_mesh/source/blender/nodes/texture/nodes/node_texture_common.c
branches/soc-2013-sketch_mesh/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/soc-2013-sketch_mesh/source/blender/python/generic/idprop_py_api.c
branches/soc-2013-sketch_mesh/source/blender/python/intern/bpy_app.c
branches/soc-2013-sketch_mesh/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2013-sketch_mesh/source/blender/python/intern/bpy_operator.c
branches/soc-2013-sketch_mesh/source/blender/python/intern/bpy_rna_callback.c
branches/soc-2013-sketch_mesh/source/blender/quicktime/CMakeLists.txt
branches/soc-2013-sketch_mesh/source/blender/quicktime/SConscript
branches/soc-2013-sketch_mesh/source/blender/quicktime/quicktime_export.h
branches/soc-2013-sketch_mesh/source/blender/quicktime/quicktime_import.h
branches/soc-2013-sketch_mesh/source/blender/render/intern/source/initrender.c
branches/soc-2013-sketch_mesh/source/blender/render/intern/source/multires_bake.c
branches/soc-2013-sketch_mesh/source/blender/render/intern/source/pipeline.c
branches/soc-2013-sketch_mesh/source/blender/render/intern/source/shadeoutput.c
branches/soc-2013-sketch_mesh/source/blender/render/intern/source/sss.c
branches/soc-2013-sketch_mesh/source/blender/windowmanager/CMakeLists.txt
branches/soc-2013-sketch_mesh/source/blender/windowmanager/SConscript
branches/soc-2013-sketch_mesh/source/blender/windowmanager/WM_api.h
branches/soc-2013-sketch_mesh/source/blender/windowmanager/WM_types.h
branches/soc-2013-sketch_mesh/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-sketch_mesh/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2013-sketch_mesh/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2013-sketch_mesh/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-sketch_mesh/source/blender/windowmanager/intern/wm_window.c
branches/soc-2013-sketch_mesh/source/blenderplayer/CMakeLists.txt
branches/soc-2013-sketch_mesh/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/soc-2013-sketch_mesh/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-sketch_mesh/source/creator/CMakeLists.txt
branches/soc-2013-sketch_mesh/source/creator/buildinfo.c
branches/soc-2013-sketch_mesh/source/creator/creator.c
branches/soc-2013-sketch_mesh/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2013-sketch_mesh/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2013-sketch_mesh/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/soc-2013-sketch_mesh/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/soc-2013-sketch_mesh/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Converter/BL_BlenderDataConversion.h
branches/soc-2013-sketch_mesh/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Converter/BlenderWorldInfo.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Converter/BlenderWorldInfo.h
branches/soc-2013-sketch_mesh/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soc-2013-sketch_mesh/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
branches/soc-2013-sketch_mesh/source/gameengine/GameLogic/SCA_ExpressionController.cpp
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/SConscript
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_CharacterWrapper.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_Dome.h
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_FontObject.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_FontObject.h
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_ISceneConverter.h
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_Light.h
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_MotionState.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_MotionState.h
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_NavMeshObject.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_RayCast.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_RayCast.h
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_TouchEventManager.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Physics/Bullet/CcdGraphicController.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Physics/Bullet/CcdGraphicController.h
branches/soc-2013-sketch_mesh/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2013-sketch_mesh/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2013-sketch_mesh/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/soc-2013-sketch_mesh/source/gameengine/Physics/common/PHY_IController.h
branches/soc-2013-sketch_mesh/source/gameengine/Physics/common/PHY_IGraphicController.h
branches/soc-2013-sketch_mesh/source/gameengine/Physics/common/PHY_IMotionState.h
branches/soc-2013-sketch_mesh/source/gameengine/Physics/common/PHY_IPhysicsController.h
branches/soc-2013-sketch_mesh/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_BucketManager.h
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_Polygon.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_Polygon.h
branches/soc-2013-sketch_mesh/source/gameengine/VideoTexture/ImageRender.cpp
branches/soc-2013-sketch_mesh/source/gameengine/VideoTexture/ImageRender.h
branches/soc-2013-sketch_mesh/source/gameengine/VideoTexture/ImageViewport.cpp
branches/soc-2013-sketch_mesh/source/gameengine/VideoTexture/Texture.cpp
branches/soc-2013-sketch_mesh/source/tools/check_style_c.py
branches/soc-2013-sketch_mesh/source/tools/spell_check_source.py
branches/soc-2013-sketch_mesh/source/tools/spell_check_source_config.py
Added Paths:
-----------
branches/soc-2013-sketch_mesh/intern/locale/msgfmt.cc
Removed Paths:
-------------
branches/soc-2013-sketch_mesh/extern/bullet2/patches/ghost_softbody.patch
branches/soc-2013-sketch_mesh/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
branches/soc-2013-sketch_mesh/intern/ghost/intern/GHOST_DisplayManagerCarbon.h
branches/soc-2013-sketch_mesh/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2013-sketch_mesh/intern/ghost/intern/GHOST_SystemCarbon.h
branches/soc-2013-sketch_mesh/intern/ghost/intern/GHOST_SystemPathsCarbon.cpp
branches/soc-2013-sketch_mesh/intern/ghost/intern/GHOST_SystemPathsCarbon.h
branches/soc-2013-sketch_mesh/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/soc-2013-sketch_mesh/intern/ghost/intern/GHOST_WindowCarbon.h
branches/soc-2013-sketch_mesh/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2013-sketch_mesh/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2013-sketch_mesh/source/blender/windowmanager/intern/wm_apple.c
branches/soc-2013-sketch_mesh/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2013-sketch_mesh/source/gameengine/BlenderRoutines/KX_BlenderGL.h
branches/soc-2013-sketch_mesh/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2013-sketch_mesh/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2013-sketch_mesh/source/gameengine/GamePlayer/common/GPC_RenderTools.h
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_IPhysicsController.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_IPhysicsController.h
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_IRenderTools.cpp
branches/soc-2013-sketch_mesh/source/gameengine/Rasterizer/RAS_IRenderTools.h
Property Changed:
----------------
branches/soc-2013-sketch_mesh/
branches/soc-2013-sketch_mesh/extern/libmv/third_party/ceres/internal/ceres/block_random_access_crs_matrix.cc
branches/soc-2013-sketch_mesh/extern/libmv/third_party/ceres/internal/ceres/c_api.cc
branches/soc-2013-sketch_mesh/extern/libmv/third_party/ceres/internal/ceres/compressed_col_sparse_matrix_utils.cc
branches/soc-2013-sketch_mesh/extern/libmv/third_party/ceres/internal/ceres/covariance_impl.cc
branches/soc-2013-sketch_mesh/extern/libmv/third_party/ceres/internal/ceres/incomplete_lq_factorization.cc
branches/soc-2013-sketch_mesh/extern/libmv/third_party/ceres/internal/ceres/lapack.cc
branches/soc-2013-sketch_mesh/release/darwin/README_codesigning.txt
branches/soc-2013-sketch_mesh/source/blender/editors/interface/interface.c
branches/soc-2013-sketch_mesh/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-sketch_mesh
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,59942,60073,60094,60096,60105
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/branches/soc-2013-rigid_body_sim:59888,60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57382-60972
+ /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,59942,60073,60094,60096,60105
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/branches/soc-2013-rigid_body_sim:59888,60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57382-61239
Modified: branches/soc-2013-sketch_mesh/CMakeLists.txt
===================================================================
--- branches/soc-2013-sketch_mesh/CMakeLists.txt 2013-11-12 18:29:08 UTC (rev 61239)
+++ branches/soc-2013-sketch_mesh/CMakeLists.txt 2013-11-12 20:30:26 UTC (rev 61240)
@@ -218,7 +218,7 @@
option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
option(WITH_CODEC_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
-if(APPLE OR (WIN32 AND NOT UNIX))
+if(APPLE)
option(WITH_CODEC_QUICKTIME "Enable Quicktime Support" OFF)
endif()
@@ -380,12 +380,7 @@
add_definitions("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif()
- option(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
- option(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
option(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
- if(CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
- set(USE_QTKIT ON CACHE BOOL "ON" FORCE) # no Quicktime in 64bit
- endif()
endif()
@@ -492,14 +487,6 @@
set(WITH_X11_XINPUT OFF)
endif()
-if(MINGW)
- if(WITH_CODEC_QUICKTIME)
- message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
- "because it is currently unsupported, remove this "
- "line if youre a developer who wants to add support.")
- endif()
-endif()
-
TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
TEST_STDBOOL_SUPPORT()
@@ -1030,13 +1017,6 @@
set(SDL_LIBPATH ${SDL}/lib)
endif()
- if(WITH_CODEC_QUICKTIME)
- set(QUICKTIME ${LIBDIR}/QTDevWin)
- set(QUICKTIME_INCLUDE_DIRS ${QUICKTIME}/CIncludes)
- set(QUICKTIME_LIBRARIES qtmlClient)
- set(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
- endif()
-
if(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
add_definitions(-D__SSE__ -D__MMX__)
endif()
@@ -1612,47 +1592,37 @@
set(PLATFORM_LINKLIBS stdc++)
endif()
- if(WITH_COCOA)
- set(PLATFORM_CFLAGS "-pipe -funsigned-char -DGHOST_COCOA")
- set(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio")
- if(USE_QTKIT)
- set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DUSE_QTKIT")
- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit")
- if(CMAKE_OSX_ARCHITECTURES MATCHES i386)
- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
- # libSDL still needs 32bit carbon quicktime
- endif()
- elseif(WITH_CODEC_QUICKTIME)
+ set(PLATFORM_CFLAGS "-pipe -funsigned-char")
+ set(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio")
+ if(WITH_CODEC_QUICKTIME)
+ set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit")
+ if(CMAKE_OSX_ARCHITECTURES MATCHES i386)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
+ # libSDL still needs 32bit carbon quicktime
endif()
+ endif()
- # XXX - SOME MAC DEV PLEASE TEST WITH THE SDK INSTALLED!
- # ALSO SHOULD BE MOVED INTO OWN MODULE WHEN FUNCTIONAL
- if(WITH_INPUT_NDOF)
- # This thread it *should* work and check the framework - campbell
- # http://www.cmake.org/pipermail/cmake/2005-December/007740.html
- find_library(3DCONNEXION_CLIENT_FRAMEWORK
- NAMES 3DconnexionClient
- )
- if(NOT 3DCONNEXION_CLIENT_FRAMEWORK)
- set(WITH_INPUT_NDOF OFF)
- endif()
+ # XXX - SOME MAC DEV PLEASE TEST WITH THE SDK INSTALLED!
+ # ALSO SHOULD BE MOVED INTO OWN MODULE WHEN FUNCTIONAL
+ if(WITH_INPUT_NDOF)
+ # This thread it *should* work and check the framework - campbell
+ # http://www.cmake.org/pipermail/cmake/2005-December/007740.html
+ find_library(3DCONNEXION_CLIENT_FRAMEWORK
+ NAMES 3DconnexionClient
+ )
+ if(NOT 3DCONNEXION_CLIENT_FRAMEWORK)
+ set(WITH_INPUT_NDOF OFF)
+ endif()
- if(WITH_INPUT_NDOF)
- set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework 3DconnexionClient")
- set(NDOF_INCLUDE_DIRS /Library/Frameworks/3DconnexionClient.framework/Headers )
- endif()
+ if(WITH_INPUT_NDOF)
+ set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework 3DconnexionClient")
+ set(NDOF_INCLUDE_DIRS /Library/Frameworks/3DconnexionClient.framework/Headers )
endif()
+ endif()
if(WITH_JACK)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework jackmp")
endif()
-
- else()
- set(PLATFORM_CFLAGS "-pipe -funsigned-char")
- 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 OR WITH_PYTHON_FRAMEWORK)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/Python")# force cmake to link right framework
Modified: branches/soc-2013-sketch_mesh/SConstruct
===================================================================
--- branches/soc-2013-sketch_mesh/SConstruct 2013-11-12 18:29:08 UTC (rev 61239)
+++ branches/soc-2013-sketch_mesh/SConstruct 2013-11-12 20:30:26 UTC (rev 61240)
@@ -285,53 +285,154 @@
env['WITH_BF_CYCLES_CUDA_BINARIES'] = True
env['WITH_BF_PYTHON'] = False
-# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY and JAckOSX detection for OSX
+
+#############################################################################
+################### Automatic configuration for OSX ##################
+#############################################################################
+
if env['OURPLATFORM']=='darwin':
+
+ import commands
+
+ cmd = 'sw_vers -productVersion'
+ MAC_CUR_VER=cmd_res=commands.getoutput(cmd)
+ cmd = 'xcodebuild -version'
+ cmd_xcode=commands.getoutput(cmd)
+ env['XCODE_CUR_VER']=cmd_xcode[6:][:3] # truncate output to major.minor version
+ cmd = 'xcodebuild -showsdks'
+ cmd_sdk=commands.getoutput(cmd)
+ MACOSX_SDK_CHECK=cmd_sdk
+ cmd = 'xcode-select --print-path'
+ XCODE_SELECT_PATH=commands.getoutput(cmd)
+ if XCODE_SELECT_PATH.endswith("/Contents/Developer"):
+ XCODE_BUNDLE=XCODE_SELECT_PATH[:-19]
+ else:
+ XCODE_BUNDLE=XCODE_SELECT_PATH
+
print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'] + " --"
- print "Available " + env['MACOSX_SDK_CHECK']
- if not 'Mac OS X 10.6' in env['MACOSX_SDK_CHECK']:
- print B.bc.OKGREEN + "Building with user-defined OS X SDK ( Xcode 4.4 or newer )"
- elif not 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']:
- print B.bc.OKGREEN + "Auto-setting available MacOSX SDK -> " + B.bc.ENDC + "MacOSX10.6.sdk"
+ print B.bc.OKGREEN + "Available SDK's: \n" + B.bc.ENDC + MACOSX_SDK_CHECK.replace('\t', '')
+
+ if env['MACOSX_SDK'] == '': # no set sdk, choosing best one found
+ if 'OS X 10.9' in MACOSX_SDK_CHECK:
+ env['MACOSX_DEPLOYMENT_TARGET'] = '10.6'
+ env['MACOSX_SDK']='/Developer/SDKs/MacOSX10.9.sdk'
+ elif 'OS X 10.8' in MACOSX_SDK_CHECK:
+ env['MACOSX_DEPLOYMENT_TARGET'] = '10.6'
+ env['MACOSX_SDK']='/Developer/SDKs/MacOSX10.8.sdk'
+ elif 'OS X 10.7' in MACOSX_SDK_CHECK:
+ env['MACOSX_DEPLOYMENT_TARGET'] = '10.6'
+ env['MACOSX_SDK']='/Developer/SDKs/MacOSX10.7.sdk'
+ elif 'OS X 10.6' in MACOSX_SDK_CHECK:
+ env['MACOSX_DEPLOYMENT_TARGET'] = '10.6'
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list