[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60727] branches/soc-2013-rigid_body_sim: svn merge -r60422:60726 ^/trunk/blender
Sergej Reich
sergej.reich at googlemail.com
Sun Oct 13 13:41:41 CEST 2013
Revision: 60727
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60727
Author: sergof
Date: 2013-10-13 11:41:41 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
svn merge -r60422:60726 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60422
Modified Paths:
--------------
branches/soc-2013-rigid_body_sim/CMakeLists.txt
branches/soc-2013-rigid_body_sim/GNUmakefile
branches/soc-2013-rigid_body_sim/SConstruct
branches/soc-2013-rigid_body_sim/build_files/build_environment/install_deps.sh
branches/soc-2013-rigid_body_sim/build_files/cmake/macros.cmake
branches/soc-2013-rigid_body_sim/build_files/scons/tools/btools.py
branches/soc-2013-rigid_body_sim/doc/python_api/examples/bpy.types.UIList.2.py
branches/soc-2013-rigid_body_sim/extern/libmv/CMakeLists.txt
branches/soc-2013-rigid_body_sim/extern/libmv/SConscript
branches/soc-2013-rigid_body_sim/extern/libmv/bundle.sh
branches/soc-2013-rigid_body_sim/extern/libmv/libmv/multiview/fundamental.cc
branches/soc-2013-rigid_body_sim/extern/libmv/libmv/multiview/fundamental.h
branches/soc-2013-rigid_body_sim/extern/libmv/libmv/multiview/homography.cc
branches/soc-2013-rigid_body_sim/extern/libmv/libmv/multiview/homography.h
branches/soc-2013-rigid_body_sim/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
branches/soc-2013-rigid_body_sim/extern/libmv/libmv-capi.cc
branches/soc-2013-rigid_body_sim/extern/libmv/libmv-capi.h
branches/soc-2013-rigid_body_sim/extern/libmv/libmv-capi_stub.cc
branches/soc-2013-rigid_body_sim/extern/libmv/third_party/msinttypes/stdint.h
branches/soc-2013-rigid_body_sim/intern/cycles/blender/CMakeLists.txt
branches/soc-2013-rigid_body_sim/intern/cycles/blender/addon/ui.py
branches/soc-2013-rigid_body_sim/intern/cycles/blender/blender_mesh.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/blender/blender_shader.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/blender/blender_sync.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/device/device.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/device/device_cuda.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/device/device_opencl.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/CMakeLists.txt
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/SConscript
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_film.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_path.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_shader.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_sse2.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_subsurface.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/kernel_types.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/osl/osl_shader.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/shaders/SConscript
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/shaders/node_environment_texture.osl
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/shaders/node_hair_bsdf.osl
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/shaders/node_sky_texture.osl
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/shaders/node_subsurface_scattering.osl
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/shaders/node_ward_bsdf.osl
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/shaders/stdosl.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/svm/svm_closure.h
branches/soc-2013-rigid_body_sim/intern/cycles/kernel/svm/svm_types.h
branches/soc-2013-rigid_body_sim/intern/cycles/render/CMakeLists.txt
branches/soc-2013-rigid_body_sim/intern/cycles/render/shader.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/render/shader.h
branches/soc-2013-rigid_body_sim/intern/cycles/util/util_opengl.h
branches/soc-2013-rigid_body_sim/intern/cycles/util/util_types.h
branches/soc-2013-rigid_body_sim/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
branches/soc-2013-rigid_body_sim/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c
branches/soc-2013-rigid_body_sim/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2013-rigid_body_sim/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2013-rigid_body_sim/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2013-rigid_body_sim/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2013-rigid_body_sim/intern/guardedalloc/CMakeLists.txt
branches/soc-2013-rigid_body_sim/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2013-rigid_body_sim/intern/guardedalloc/SConscript
branches/soc-2013-rigid_body_sim/intern/guardedalloc/intern/mallocn.c
branches/soc-2013-rigid_body_sim/intern/guardedalloc/mmap_win.h
branches/soc-2013-rigid_body_sim/intern/opencolorio/CMakeLists.txt
branches/soc-2013-rigid_body_sim/intern/opencolorio/SConscript
branches/soc-2013-rigid_body_sim/intern/opencolorio/fallback_impl.cc
branches/soc-2013-rigid_body_sim/intern/opencolorio/ocio_capi.cc
branches/soc-2013-rigid_body_sim/intern/opencolorio/ocio_capi.h
branches/soc-2013-rigid_body_sim/intern/opencolorio/ocio_impl.cc
branches/soc-2013-rigid_body_sim/intern/opencolorio/ocio_impl.h
branches/soc-2013-rigid_body_sim/intern/opencolorio/ocio_impl_glsl.cc
branches/soc-2013-rigid_body_sim/release/datafiles/splash.png
branches/soc-2013-rigid_body_sim/release/scripts/modules/bpy/path.py
branches/soc-2013-rigid_body_sim/release/scripts/modules/rna_info.py
branches/soc-2013-rigid_body_sim/release/scripts/modules/rna_keymap_ui.py
branches/soc-2013-rigid_body_sim/release/scripts/presets/keyconfig/maya.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_operators/node.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/properties_freestyle.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/properties_paint_common.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/space_image.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/space_node.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2013-rigid_body_sim/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-rigid_body_sim/release/scripts/templates_py/custom_nodes.py
branches/soc-2013-rigid_body_sim/release/scripts/templates_py/ui_list.py
branches/soc-2013-rigid_body_sim/source/blender/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/blender/SConscript
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_action.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_animsys.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_deform.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_node.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/BKE_subsurf.h
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/SConscript
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/action.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/anim.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/colortools.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/curve.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/customdata.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/deform.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/fcurve.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/freestyle.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/idprop.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/image.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/library.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/mesh_evaluate.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/movieclip.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/multires.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/node.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/object.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/paint.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/particle.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/scene.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/sequencer.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/texture.c
branches/soc-2013-rigid_body_sim/source/blender/blenkernel/intern/tracking.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_bitmap.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_boxpack2d.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_linklist_stack.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_memarena.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_mempool.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_scanfill.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_threads.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/BLI_memarena.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/boxpack2d.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/lasso.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/math_rotation.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/noise.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/smallhash.c
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/threads.c
branches/soc-2013-rigid_body_sim/source/blender/blenloader/intern/readfile.c
branches/soc-2013-rigid_body_sim/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2013-rigid_body_sim/source/blender/blenloader/intern/writefile.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_core.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_iterators.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_iterators.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-rigid_body_sim/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_connect_nonplanar.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_edgenet.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_fill_attribute.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_fill_holes.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_join_triangles.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_symmetrize.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_triangulate.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/tools/bmesh_bisect_plane.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
branches/soc-2013-rigid_body_sim/source/blender/bmesh/tools/bmesh_triangulate.c
branches/soc-2013-rigid_body_sim/source/blender/collada/AnimationExporter.cpp
branches/soc-2013-rigid_body_sim/source/blender/collada/ArmatureExporter.cpp
branches/soc-2013-rigid_body_sim/source/blender/collada/ControllerExporter.cpp
branches/soc-2013-rigid_body_sim/source/blender/collada/ExportSettings.h
branches/soc-2013-rigid_body_sim/source/blender/collada/collada.cpp
branches/soc-2013-rigid_body_sim/source/blender/collada/collada.h
branches/soc-2013-rigid_body_sim/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2013-rigid_body_sim/source/blender/editors/animation/anim_filter.c
branches/soc-2013-rigid_body_sim/source/blender/editors/animation/anim_markers.c
branches/soc-2013-rigid_body_sim/source/blender/editors/animation/keyframes_edit.c
branches/soc-2013-rigid_body_sim/source/blender/editors/animation/keyframing.c
branches/soc-2013-rigid_body_sim/source/blender/editors/armature/BIF_retarget.h
branches/soc-2013-rigid_body_sim/source/blender/editors/armature/armature_naming.c
branches/soc-2013-rigid_body_sim/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2013-rigid_body_sim/source/blender/editors/armature/pose_lib.c
branches/soc-2013-rigid_body_sim/source/blender/editors/curve/editcurve_add.c
branches/soc-2013-rigid_body_sim/source/blender/editors/curve/editfont.c
branches/soc-2013-rigid_body_sim/source/blender/editors/include/BIF_glutil.h
branches/soc-2013-rigid_body_sim/source/blender/editors/include/ED_mask.h
branches/soc-2013-rigid_body_sim/source/blender/editors/include/ED_mesh.h
branches/soc-2013-rigid_body_sim/source/blender/editors/include/ED_render.h
branches/soc-2013-rigid_body_sim/source/blender/editors/include/ED_transform.h
branches/soc-2013-rigid_body_sim/source/blender/editors/include/ED_view3d.h
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface.c
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_draw.c
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_intern.h
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_layout.c
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_regions.c
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/view2d_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/io/io_collada.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mask/SConscript
branches/soc-2013-rigid_body_sim/source/blender/editors/mask/mask_draw.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_bevel.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_bisect.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_extrude.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_inset.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-rigid_body_sim/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-rigid_body_sim/source/blender/editors/object/object_bake.c
branches/soc-2013-rigid_body_sim/source/blender/editors/object/object_edit.c
branches/soc-2013-rigid_body_sim/source/blender/editors/object/object_group.c
branches/soc-2013-rigid_body_sim/source/blender/editors/object/object_hook.c
branches/soc-2013-rigid_body_sim/source/blender/editors/object/object_vgroup.c
branches/soc-2013-rigid_body_sim/source/blender/editors/physics/particle_edit.c
branches/soc-2013-rigid_body_sim/source/blender/editors/render/render_internal.c
branches/soc-2013-rigid_body_sim/source/blender/editors/render/render_opengl.c
branches/soc-2013-rigid_body_sim/source/blender/editors/render/render_shading.c
branches/soc-2013-rigid_body_sim/source/blender/editors/screen/glutil.c
branches/soc-2013-rigid_body_sim/source/blender/editors/screen/screendump.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-rigid_body_sim/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_clip/clip_editor.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_console/space_console.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/blender/editors/space_file/SConscript
branches/soc-2013-rigid_body_sim/source/blender/editors/space_file/file_intern.h
branches/soc-2013-rigid_body_sim/source/blender/editors/space_file/file_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_file/file_panels.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_file/space_file.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_graph/graph_draw.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/blender/editors/space_image/SConscript
branches/soc-2013-rigid_body_sim/source/blender/editors/space_image/image_buttons.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_image/image_draw.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_image/image_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_image/space_image.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_info/info_stats.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_node/drawnode.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_node/node_draw.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_node/node_edit.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_node/node_templates.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_node/node_view.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_sequencer/sequencer_modifier.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_sequencer/sequencer_view.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_text/space_text.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_text/text_autocomplete.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_text/text_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform.c
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform.h
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform_generics.c
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform_input.c
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform_ops.c
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform_orientations.c
branches/soc-2013-rigid_body_sim/source/blender/editors/transform/transform_snap.c
branches/soc-2013-rigid_body_sim/source/blender/editors/util/ed_util.c
branches/soc-2013-rigid_body_sim/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2013-rigid_body_sim/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
branches/soc-2013-rigid_body_sim/source/blender/gpu/intern/gpu_material.c
branches/soc-2013-rigid_body_sim/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2013-rigid_body_sim/source/blender/imbuf/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/blender/imbuf/IMB_colormanagement.h
branches/soc-2013-rigid_body_sim/source/blender/imbuf/IMB_imbuf.h
branches/soc-2013-rigid_body_sim/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2013-rigid_body_sim/source/blender/imbuf/SConscript
branches/soc-2013-rigid_body_sim/source/blender/imbuf/intern/IMB_filetype.h
branches/soc-2013-rigid_body_sim/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-rigid_body_sim/source/blender/imbuf/intern/filetype.c
branches/soc-2013-rigid_body_sim/source/blender/imbuf/intern/indexer.c
branches/soc-2013-rigid_body_sim/source/blender/imbuf/intern/readimage.c
branches/soc-2013-rigid_body_sim/source/blender/imbuf/intern/tiff.c
branches/soc-2013-rigid_body_sim/source/blender/imbuf/intern/util.c
branches/soc-2013-rigid_body_sim/source/blender/imbuf/intern/writeimage.c
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_mask_types.h
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_node_types.h
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_scene_types.h
branches/soc-2013-rigid_body_sim/source/blender/makesdna/DNA_space_types.h
branches/soc-2013-rigid_body_sim/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/blender/makesdna/intern/SConscript
branches/soc-2013-rigid_body_sim/source/blender/makesrna/RNA_define.h
branches/soc-2013-rigid_body_sim/source/blender/makesrna/SConscript
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/SConscript
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/makesrna.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_armature.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_define.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_meta.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_pose.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_render.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_texture.c
branches/soc-2013-rigid_body_sim/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_gamma.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/soc-2013-rigid_body_sim/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/soc-2013-rigid_body_sim/source/blender/python/intern/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2013-rigid_body_sim/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2013-rigid_body_sim/source/blender/python/mathutils/mathutils_Euler.h
branches/soc-2013-rigid_body_sim/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2013-rigid_body_sim/source/blender/python/mathutils/mathutils_Quaternion.h
branches/soc-2013-rigid_body_sim/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2013-rigid_body_sim/source/blender/python/mathutils/mathutils_Vector.h
branches/soc-2013-rigid_body_sim/source/blender/render/extern/include/RE_multires_bake.h
branches/soc-2013-rigid_body_sim/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2013-rigid_body_sim/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2013-rigid_body_sim/source/blender/render/intern/include/render_types.h
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/bake.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/convertblender.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/imagetexture.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/multires_bake.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/pipeline.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/pixelshading.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/rendercore.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/shadbuf.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/shadeinput.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/sss.c
branches/soc-2013-rigid_body_sim/source/blender/render/intern/source/volume_precache.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/WM_api.h
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/WM_keymap.h
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/intern/wm_dragdrop.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/intern/wm_files.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/intern/wm_window.c
branches/soc-2013-rigid_body_sim/source/blender/windowmanager/wm_subwindow.h
branches/soc-2013-rigid_body_sim/source/blenderplayer/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-rigid_body_sim/source/creator/CMakeLists.txt
branches/soc-2013-rigid_body_sim/source/creator/creator.c
branches/soc-2013-rigid_body_sim/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-rigid_body_sim/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2013-rigid_body_sim/source/tools/CTS/FBlender.py
Added Paths:
-----------
branches/soc-2013-rigid_body_sim/extern/libmv/libmv-capi_intern.h
branches/soc-2013-rigid_body_sim/intern/guardedalloc/intern/mallocn_guarded_impl.c
branches/soc-2013-rigid_body_sim/intern/guardedalloc/intern/mallocn_intern.h
branches/soc-2013-rigid_body_sim/intern/guardedalloc/intern/mallocn_lockfree_impl.c
branches/soc-2013-rigid_body_sim/intern/opencolorio/gpu_shader_display_transform.glsl
branches/soc-2013-rigid_body_sim/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_rigged.py
branches/soc-2013-rigid_body_sim/release/scripts/presets/operator/wm.collada_export/sl_plus_open_sim_static.py
branches/soc-2013-rigid_body_sim/source/blender/blenlib/BLI_task.h
branches/soc-2013-rigid_body_sim/source/blender/blenlib/intern/task.c
branches/soc-2013-rigid_body_sim/source/blender/collada/version.conf
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface_eyedropper.c
branches/soc-2013-rigid_body_sim/source/blender/imbuf/intern/oiio/
branches/soc-2013-rigid_body_sim/source/tools/check_descriptions.py
Removed Paths:
-------------
branches/soc-2013-rigid_body_sim/intern/cycles/render/bssrdf.cpp
branches/soc-2013-rigid_body_sim/intern/cycles/render/bssrdf.h
branches/soc-2013-rigid_body_sim/release/scripts/presets/operator/wm.collada_export/second_life_rigged.py
branches/soc-2013-rigid_body_sim/release/scripts/presets/operator/wm.collada_export/second_life_static.py
Property Changed:
----------------
branches/soc-2013-rigid_body_sim/
branches/soc-2013-rigid_body_sim/source/blender/editors/interface/interface.c
branches/soc-2013-rigid_body_sim/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-rigid_body_sim
___________________________________________________________________
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
/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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57521,57525-57642,57644-57984,57986-57990,57992-58488,58495-59228,59230-59868,59870-60272,60274-60421
+ /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
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57521,57525-57642,57644-57984,57986-57990,57992-58488,58495-59228,59230-59868,59870-60272,60274-60421,60423-60726
Modified: branches/soc-2013-rigid_body_sim/CMakeLists.txt
===================================================================
--- branches/soc-2013-rigid_body_sim/CMakeLists.txt 2013-10-13 09:35:54 UTC (rev 60726)
+++ branches/soc-2013-rigid_body_sim/CMakeLists.txt 2013-10-13 11:41:41 UTC (rev 60727)
@@ -203,6 +203,7 @@
option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF)
# Image format support
+option(WITH_OPENIMAGEIO "Enable OpenImageIO Support (http://www.openimageio.org)" OFF)
option(WITH_IMAGE_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
option(WITH_IMAGE_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org)" ON)
option(WITH_IMAGE_TIFF "Enable LibTIFF Support" ON)
@@ -278,13 +279,14 @@
option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
mark_as_advanced(WITH_MEM_JEMALLOC)
+# currently only used for BLI_mempool
+option(WITH_MEM_VALGRIND "Enable extended valgrind support for better reporting" OFF)
+mark_as_advanced(WITH_MEM_VALGRIND)
+
# Debug
option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking (only enable for development)" OFF)
mark_as_advanced(WITH_CXX_GUARDEDALLOC)
-option(WITH_GUARDEDALLOC "Enable GuardedAlloc (DISABLE AT OWN RISK!)" ON)
-mark_as_advanced(WITH_GUARDEDALLOC)
-
option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
mark_as_advanced(WITH_ASSERT_ABORT)
@@ -368,7 +370,7 @@
endif()
if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
- set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our min. target, if you use higher sdk, weak linking happens
+ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our min. target, if you use higher sdk, weak linking happens
endif()
if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")
@@ -2281,10 +2283,12 @@
info_cfg_option(WITH_X11_XF86VMODE)
info_cfg_option(WITH_X11_XINPUT)
info_cfg_option(WITH_MEM_JEMALLOC)
+ info_cfg_option(WITH_MEM_VALGRIND)
info_cfg_option(WITH_SYSTEM_GLEW)
info_cfg_option(WITH_SYSTEM_OPENJPEG)
info_cfg_text("Image Formats:")
+ info_cfg_option(WITH_OPENIMAGEIO)
info_cfg_option(WITH_IMAGE_CINEON)
info_cfg_option(WITH_IMAGE_DDS)
info_cfg_option(WITH_IMAGE_HDR)
Modified: branches/soc-2013-rigid_body_sim/GNUmakefile
===================================================================
--- branches/soc-2013-rigid_body_sim/GNUmakefile 2013-10-13 09:35:54 UTC (rev 60726)
+++ branches/soc-2013-rigid_body_sim/GNUmakefile 2013-10-13 11:41:41 UTC (rev 60727)
@@ -182,6 +182,7 @@
@echo " * check_spelling_c_qtc - same as check_spelling_c but outputs QtCreator tasks format"
@echo " * check_spelling_osl - check for spelling errors (OSL only)"
@echo " * check_spelling_py - check for spelling errors (Python only)"
+ @echo " * check_descriptions - check for duplicate/invalid descriptions"
@echo ""
@echo "Utilities (not associated with building blender)"
@echo " * icons - updates PNG icons from SVG files."
@@ -313,6 +314,9 @@
check_spelling_osl:
cd $(BUILD_DIR) ; PYTHONIOENCODING=utf_8 python3 $(BLENDER_DIR)/source/tools/spell_check_source.py $(BLENDER_DIR)/intern/cycles/kernel/shaders
+check_descriptions:
+ $(BUILD_DIR)/bin/blender --background -noaudio --factory-startup --python $(BLENDER_DIR)/source/tools/check_descriptions.py
+
# -----------------------------------------------------------------------------
# Utilities
#
Modified: branches/soc-2013-rigid_body_sim/SConstruct
===================================================================
--- branches/soc-2013-rigid_body_sim/SConstruct 2013-10-13 09:35:54 UTC (rev 60726)
+++ branches/soc-2013-rigid_body_sim/SConstruct 2013-10-13 11:41:41 UTC (rev 60727)
@@ -246,6 +246,7 @@
target_env_defs['WITH_BF_CYCLES'] = False
target_env_defs['WITH_BF_OPENAL'] = False
target_env_defs['WITH_BF_OPENEXR'] = False
+ target_env_defs['WITH_BF_PSD'] = False
target_env_defs['WITH_BF_OPENMP'] = False
target_env_defs['WITH_BF_ICONV'] = False
target_env_defs['WITH_BF_INTERNATIONAL'] = False
@@ -289,13 +290,13 @@
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 + "Auto-setting available MacOSX SDK -> " + B.bc.ENDC + "MacOSX10.7.sdk"
+ 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"
else:
print B.bc.OKGREEN + "Found recommended sdk :" + B.bc.ENDC + " using MacOSX10.5.sdk"
- if env['CXX'].startswith('clang') and env['XCODE_CUR_VER'] >= '5':
+ if env['XCODE_CUR_VER'] >= '5' and not (env['CXX'][:-2].endswith('4.6') or env['CXX'][:-2].endswith('4.8')):
env['CCFLAGS'].append('-ftemplate-depth=1024') # only valid for clang bundled with xcode 5
# for now, Mac builders must download and install the 3DxWare 10 Beta 4 driver framework from 3Dconnexion
@@ -551,6 +552,7 @@
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vertex.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl")
+ data_to_c_simple("intern/opencolorio/gpu_shader_display_transform.glsl")
# --- blender ---
data_to_c_simple("release/datafiles/bfont.pfb")
Modified: branches/soc-2013-rigid_body_sim/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-rigid_body_sim/build_files/build_environment/install_deps.sh 2013-10-13 09:35:54 UTC (rev 60726)
+++ branches/soc-2013-rigid_body_sim/build_files/build_environment/install_deps.sh 2013-10-13 11:41:41 UTC (rev 60727)
@@ -3145,7 +3145,7 @@
fi
if $ALL_STATIC; then
- INFO "LLIB = ["xml2", "expat"] + LLIB"
+ INFO "LLIBS = [\""xml2"\", \""expat"\"] + LLIBS"
fi
INFO ""
Modified: branches/soc-2013-rigid_body_sim/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-rigid_body_sim/build_files/cmake/macros.cmake 2013-10-13 09:35:54 UTC (rev 60726)
+++ branches/soc-2013-rigid_body_sim/build_files/cmake/macros.cmake 2013-10-13 11:41:41 UTC (rev 60727)
@@ -585,7 +585,8 @@
macro(get_blender_version)
# So cmake depends on BKE_blender.h, beware of inf-loops!
- CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h ${CMAKE_BINARY_DIR}/source/blender/blenkernel/BKE_blender.h.done)
+ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h
+ ${CMAKE_BINARY_DIR}/source/blender/blenkernel/BKE_blender.h.done)
file(STRINGS ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h _contents REGEX "^#define[ \t]+BLENDER_.*$")
Modified: branches/soc-2013-rigid_body_sim/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2013-rigid_body_sim/build_files/scons/tools/btools.py 2013-10-13 09:35:54 UTC (rev 60726)
+++ branches/soc-2013-rigid_body_sim/build_files/scons/tools/btools.py 2013-10-13 11:41:41 UTC (rev 60727)
@@ -576,7 +576,7 @@
('BF_CYCLES_CUDA_BINARIES_ARCH', 'CUDA architectures to compile binaries for', []),
(BoolVariable('WITH_BF_OIIO', 'Build with OpenImageIO', False)),
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list