Blender Git Loki
Git Commits -> Revision 497a877
Revision 497a877 by Antonis Ryakiotakis (soc-2013-paint) August 19, 2013, 14:16 (GMT) |
Merge trunk -r59300 into soc-2013-paint |
Commit Details:
Full Hash: 497a87781a8716ff954be7d1f766a357f0addff2
SVN Revision: 59301
Parent Commit: 6283055
Lines Changed: +1694, -938
3 Added Paths:
/intern/atomic/atomic_ops.h (+307, -0) (View)
/source/blender/blenlib/BLI_sort.h (+41, -0) (View)
/source/blender/blenlib/intern/sort.c (+162, -0) (View)
/source/blender/blenlib/BLI_sort.h (+41, -0) (View)
/source/blender/blenlib/intern/sort.c (+162, -0) (View)
107 Modified Paths:
/extern/recastnavigation/recast-capi.cpp (+0, -126) (Diff)
/extern/recastnavigation/recast-capi.h (+0, -5) (Diff)
/intern/cycles/blender/addon/properties.py (+1, -0) (Diff)
/intern/cycles/kernel/kernel_types.h (+4, -3) (Diff)
/intern/cycles/kernel/shaders/node_subsurface_scattering.osl (+3, -3) (Diff)
/intern/ghost/intern/GHOST_SystemWin32.cpp (+19, -24) (Diff)
/intern/guardedalloc/CMakeLists.txt (+1, -0) (Diff)
/intern/guardedalloc/intern/mallocn.c (+25, -27) (Diff)
/intern/guardedalloc/SConscript (+1, -1) (Diff)
/intern/opencolorio/ocio_impl.cc (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_clip.py (+7, -6) (Diff)
/source/blender/blenkernel/BKE_anim.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_armature.h (+3, -1) (Diff)
/source/blender/blenkernel/BKE_curve.h (+15, -5) (Diff)
/source/blender/blenkernel/BKE_key.h (+11, -1) (Diff)
/source/blender/blenkernel/BKE_lattice.h (+8, -3) (Diff)
/source/blender/blenkernel/BKE_mball.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_modifier.h (+12, -1) (Diff)
/source/blender/blenkernel/BKE_object.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_particle.h (+2, -1) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+1, -0) (Diff)
/source/blender/blenkernel/intern/anim.c (+12, -14) (Diff)
/source/blender/blenkernel/intern/armature.c (+8, -16) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+7, -1) (Diff)
/source/blender/blenkernel/intern/constraint.c (+8, -14) (Diff)
/source/blender/blenkernel/intern/curve.c (+58, -63) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+5, -2) (Diff)
/source/blender/blenkernel/intern/displist.c (+93, -111) (Diff)
/source/blender/blenkernel/intern/effect.c (+3, -2) (Diff)
/source/blender/blenkernel/intern/font.c (+22, -4) (Diff)
/source/blender/blenkernel/intern/key.c (+83, -31) (Diff)
/source/blender/blenkernel/intern/lattice.c (+55, -34) (Diff)
/source/blender/blenkernel/intern/material.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/mball.c (+5, -6) (Diff)
/source/blender/blenkernel/intern/mesh.c (+18, -4) (Diff)
/source/blender/blenkernel/intern/modifier.c (+64, -64) (Diff)
/source/blender/blenkernel/intern/navmesh_conversion.c (+2, -1) (Diff)
/source/blender/blenkernel/intern/object.c (+49, -27) (Diff)
/source/blender/blenkernel/intern/object_deform.c (+2, -1) (Diff)
/source/blender/blenkernel/intern/particle.c (+24, -24) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+21, -22) (Diff)
/source/blender/blenkernel/intern/pbvh_bmesh.c (+37, -1) (Diff)
/source/blender/blenkernel/SConscript (+1, -0) (Diff)
/source/blender/blenlib/BLI_threads.h (+1, -0) (Diff)
/source/blender/blenlib/CMakeLists.txt (+2, -0) (Diff)
/source/blender/blenlib/intern/BLI_mempool.c (+16, -0) (Diff)
/source/blender/blenlib/intern/storage.c (+12, -2) (Diff)
/source/blender/blenlib/intern/threads.c (+10, -3) (Diff)
/source/blender/blenlib/PIL_time.h (+20, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+15, -18) (Diff)
/source/blender/bmesh/intern/bmesh_log.c (+25, -0) (Diff)
/source/blender/bmesh/intern/bmesh_log.h (+3, -0) (Diff)
/source/blender/bmesh/intern/bmesh_queries.c (+25, -6) (Diff)
/source/blender/bmesh/intern/bmesh_queries.h (+1, -0) (Diff)
/source/blender/bmesh/tools/bmesh_edgenet.c (+1, -1) (Diff)
/source/blender/bmesh/tools/bmesh_edgesplit.c (+4, -2) (Diff)
/source/blender/compositor/intern/COM_MemoryBuffer.cpp (+2, -7) (Diff)
/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp (+4, -3) (Diff)
/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp (+4, -3) (Diff)
/source/blender/editors/armature/armature_skinning.c (+3, -2) (Diff)
/source/blender/editors/interface/interface_templates.c (+3, -1) (Diff)
/source/blender/editors/mask/mask_relationships.c (+1, -0) (Diff)
/source/blender/editors/mesh/editmesh_rip.c (+65, -52) (Diff)
/source/blender/editors/mesh/meshtools.c (+0, -1) (Diff)
/source/blender/editors/object/object_add.c (+7, -7) (Diff)
/source/blender/editors/object/object_modifier.c (+2, -2) (Diff)
/source/blender/editors/sculpt_paint/sculpt.c (+18, -14) (Diff)
/source/blender/editors/space_clip/clip_draw.c (+11, -4) (Diff)
/source/blender/editors/space_info/info_stats.c (+2, -2) (Diff)
/source/blender/editors/space_outliner/outliner_tree.c (+6, -2) (Diff)
/source/blender/editors/space_view3d/drawarmature.c (+11, -7) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+27, -24) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/view3d_iterators.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_view.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_snap.c (+44, -2) (Diff)
/source/blender/editors/util/crazyspace.c (+6, -3) (Diff)
/source/blender/freestyle/intern/stroke/StrokeShader.h (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_buffers.c (+52, -8) (Diff)
/source/blender/makesdna/DNA_curve_types.h (+0, -4) (Diff)
/source/blender/makesdna/DNA_key_types.h (+0, -1) (Diff)
/source/blender/makesdna/DNA_lattice_types.h (+0, -4) (Diff)
/source/blender/makesdna/DNA_meta_types.h (+0, -2) (Diff)
/source/blender/makesdna/DNA_object_types.h (+7, -2) (Diff)
/source/blender/makesdna/DNA_particle_types.h (+3, -1) (Diff)
/source/blender/makesdna/DNA_space_types.h (+13, -1) (Diff)
/source/blender/makesdna/intern/CMakeLists.txt (+1, -0) (Diff)
/source/blender/makesdna/intern/SConscript (+1, -0) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_main_api.c (+7, -2) (Diff)
/source/blender/makesrna/intern/rna_mesh.c (+4, -2) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+2, -0) (Diff)
/source/blender/makesrna/SConscript (+1, -0) (Diff)
/source/blender/modifiers/intern/MOD_array.c (+4, -3) (Diff)
/source/blender/modifiers/intern/MOD_explode.c (+4, -4) (Diff)
/source/blender/modifiers/intern/MOD_particleinstance.c (+4, -4) (Diff)
/source/blender/render/intern/source/convertblender.c (+4, -4) (Diff)
/source/blender/render/intern/source/pointdensity.c (+4, -4) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+3, -0) (Diff)
/source/creator/creator.c (+2, -0) (Diff)
/source/gameengine/Converter/BL_ShapeDeformer.cpp (+8, -4) (Diff)
/source/gameengine/GameLogic/SCA_IScene.cpp (+1, -1) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp (+3, -0) (Diff)
/source/gameengine/Ketsji/KX_Scene.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.cpp (+0, -57) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.h (+0, -3) (Diff)
/extern/recastnavigation/recast-capi.h (+0, -5) (Diff)
/intern/cycles/blender/addon/properties.py (+1, -0) (Diff)
/intern/cycles/kernel/kernel_types.h (+4, -3) (Diff)
/intern/cycles/kernel/shaders/node_subsurface_scattering.osl (+3, -3) (Diff)
/intern/ghost/intern/GHOST_SystemWin32.cpp (+19, -24) (Diff)
/intern/guardedalloc/CMakeLists.txt (+1, -0) (Diff)
/intern/guardedalloc/intern/mallocn.c (+25, -27) (Diff)
/intern/guardedalloc/SConscript (+1, -1) (Diff)
/intern/opencolorio/ocio_impl.cc (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_clip.py (+7, -6) (Diff)
/source/blender/blenkernel/BKE_anim.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_armature.h (+3, -1) (Diff)
/source/blender/blenkernel/BKE_curve.h (+15, -5) (Diff)
/source/blender/blenkernel/BKE_key.h (+11, -1) (Diff)
/source/blender/blenkernel/BKE_lattice.h (+8, -3) (Diff)
/source/blender/blenkernel/BKE_mball.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_modifier.h (+12, -1) (Diff)
/source/blender/blenkernel/BKE_object.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_particle.h (+2, -1) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+1, -0) (Diff)
/source/blender/blenkernel/intern/anim.c (+12, -14) (Diff)
/source/blender/blenkernel/intern/armature.c (+8, -16) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+7, -1) (Diff)
/source/blender/blenkernel/intern/constraint.c (+8, -14) (Diff)
/source/blender/blenkernel/intern/curve.c (+58, -63) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+5, -2) (Diff)
/source/blender/blenkernel/intern/displist.c (+93, -111) (Diff)
/source/blender/blenkernel/intern/effect.c (+3, -2) (Diff)
/source/blender/blenkernel/intern/font.c (+22, -4) (Diff)
/source/blender/blenkernel/intern/key.c (+83, -31) (Diff)
/source/blender/blenkernel/intern/lattice.c (+55, -34) (Diff)
/source/blender/blenkernel/intern/material.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/mball.c (+5, -6) (Diff)
/source/blender/blenkernel/intern/mesh.c (+18, -4) (Diff)
/source/blender/blenkernel/intern/modifier.c (+64, -64) (Diff)
/source/blender/blenkernel/intern/navmesh_conversion.c (+2, -1) (Diff)
/source/blender/blenkernel/intern/object.c (+49, -27) (Diff)
/source/blender/blenkernel/intern/object_deform.c (+2, -1) (Diff)
/source/blender/blenkernel/intern/particle.c (+24, -24) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+21, -22) (Diff)
/source/blender/blenkernel/intern/pbvh_bmesh.c (+37, -1) (Diff)
/source/blender/blenkernel/SConscript (+1, -0) (Diff)
/source/blender/blenlib/BLI_threads.h (+1, -0) (Diff)
/source/blender/blenlib/CMakeLists.txt (+2, -0) (Diff)
/source/blender/blenlib/intern/BLI_mempool.c (+16, -0) (Diff)
/source/blender/blenlib/intern/storage.c (+12, -2) (Diff)
/source/blender/blenlib/intern/threads.c (+10, -3) (Diff)
/source/blender/blenlib/PIL_time.h (+20, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+15, -18) (Diff)
/source/blender/bmesh/intern/bmesh_log.c (+25, -0) (Diff)
/source/blender/bmesh/intern/bmesh_log.h (+3, -0) (Diff)
/source/blender/bmesh/intern/bmesh_queries.c (+25, -6) (Diff)
/source/blender/bmesh/intern/bmesh_queries.h (+1, -0) (Diff)
/source/blender/bmesh/tools/bmesh_edgenet.c (+1, -1) (Diff)
/source/blender/bmesh/tools/bmesh_edgesplit.c (+4, -2) (Diff)
/source/blender/compositor/intern/COM_MemoryBuffer.cpp (+2, -7) (Diff)
/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp (+4, -3) (Diff)
/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp (+4, -3) (Diff)
/source/blender/editors/armature/armature_skinning.c (+3, -2) (Diff)
/source/blender/editors/interface/interface_templates.c (+3, -1) (Diff)
/source/blender/editors/mask/mask_relationships.c (+1, -0) (Diff)
/source/blender/editors/mesh/editmesh_rip.c (+65, -52) (Diff)
/source/blender/editors/mesh/meshtools.c (+0, -1) (Diff)
/source/blender/editors/object/object_add.c (+7, -7) (Diff)
/source/blender/editors/object/object_modifier.c (+2, -2) (Diff)
/source/blender/editors/sculpt_paint/sculpt.c (+18, -14) (Diff)
/source/blender/editors/space_clip/clip_draw.c (+11, -4) (Diff)
/source/blender/editors/space_info/info_stats.c (+2, -2) (Diff)
/source/blender/editors/space_outliner/outliner_tree.c (+6, -2) (Diff)
/source/blender/editors/space_view3d/drawarmature.c (+11, -7) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+27, -24) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/view3d_iterators.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_view.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_snap.c (+44, -2) (Diff)
/source/blender/editors/util/crazyspace.c (+6, -3) (Diff)
/source/blender/freestyle/intern/stroke/StrokeShader.h (+1, -1) (Diff)
/source/blender/gpu/intern/gpu_buffers.c (+52, -8) (Diff)
/source/blender/makesdna/DNA_curve_types.h (+0, -4) (Diff)
/source/blender/makesdna/DNA_key_types.h (+0, -1) (Diff)
/source/blender/makesdna/DNA_lattice_types.h (+0, -4) (Diff)
/source/blender/makesdna/DNA_meta_types.h (+0, -2) (Diff)
/source/blender/makesdna/DNA_object_types.h (+7, -2) (Diff)
/source/blender/makesdna/DNA_particle_types.h (+3, -1) (Diff)
/source/blender/makesdna/DNA_space_types.h (+13, -1) (Diff)
/source/blender/makesdna/intern/CMakeLists.txt (+1, -0) (Diff)
/source/blender/makesdna/intern/SConscript (+1, -0) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_main_api.c (+7, -2) (Diff)
/source/blender/makesrna/intern/rna_mesh.c (+4, -2) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+2, -0) (Diff)
/source/blender/makesrna/SConscript (+1, -0) (Diff)
/source/blender/modifiers/intern/MOD_array.c (+4, -3) (Diff)
/source/blender/modifiers/intern/MOD_explode.c (+4, -4) (Diff)
/source/blender/modifiers/intern/MOD_particleinstance.c (+4, -4) (Diff)
/source/blender/render/intern/source/convertblender.c (+4, -4) (Diff)
/source/blender/render/intern/source/pointdensity.c (+4, -4) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+3, -0) (Diff)
/source/creator/creator.c (+2, -0) (Diff)
/source/gameengine/Converter/BL_ShapeDeformer.cpp (+8, -4) (Diff)
/source/gameengine/GameLogic/SCA_IScene.cpp (+1, -1) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp (+3, -0) (Diff)
/source/gameengine/Ketsji/KX_Scene.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.cpp (+0, -57) (Diff)
/source/gameengine/Rasterizer/RAS_MeshObject.h (+0, -3) (Diff)