Blender Git Loki

Git Commits -> Revision 6636908

Revision 6636908 by Antonis Ryakiotakis (soc-2013-paint)
June 21, 2013, 08:53 (GMT)
Merge trunk -r57626 into soc-2013-paint

Commit Details:

Full Hash: 66369080c4a335fb68b058b1efa29fb8539b0a11
SVN Revision: 57628
Parent Commit: fc62be4
Lines Changed: +1029, -510

1 Added Path:

/release/scripts/startup/bl_ui/space_properties.py (+46, -0) (View)

1 Deleted Path:

/source/blender/editors/space_buttons/buttons_header.c (+0, -140)

91 Modified Paths:

/build_files/buildbot/config/user-config-cuda-glibc211-i686.py (+1, -1) (Diff)
/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py (+1, -1) (Diff)
/build_files/buildbot/config/user-config-mac-i386.py (+1, -1) (Diff)
/build_files/buildbot/config/user-config-mac-x86_64.py (+1, -1) (Diff)
/build_files/buildbot/slave_compile.py (+4, -2) (Diff)
/build_files/build_environment/install_deps.sh (+12, -2) (Diff)
/build_files/scons/config/darwin-config.py (+1, -1) (Diff)
/build_files/scons/config/linux-config.py (+1, -1) (Diff)
/build_files/scons/config/win32-mingw-config.py (+1, -1) (Diff)
/build_files/scons/config/win32-vc-config.py (+1, -1) (Diff)
/build_files/scons/config/win64-mingw-config.py (+1, -1) (Diff)
/build_files/scons/config/win64-vc-config.py (+1, -1) (Diff)
/CMakeLists.txt (+4, -4) (Diff)
/intern/audaspace/intern/AUD_Sequencer.cpp (+1, -1) (Diff)
/intern/audaspace/intern/AUD_SequencerReader.cpp (+2, -2) (Diff)
/intern/cycles/CMakeLists.txt (+7, -3) (Diff)
/intern/cycles/device/device_cuda.cpp (+47, -3) (Diff)
/intern/cycles/device/device_opencl.cpp (+1, -1) (Diff)
/intern/cycles/kernel/CMakeLists.txt (+54, -14) (Diff)
/intern/cycles/kernel/kernel_bvh_traversal.h (+29, -25) (Diff)
/intern/cycles/kernel/kernel_jitter.h (+2, -2) (Diff)
/intern/cycles/kernel/kernel_shader.h (+18, -3) (Diff)
/intern/cycles/kernel/SConscript (+42, -3) (Diff)
/intern/cycles/SConscript (+4, -4) (Diff)
/intern/cycles/util/util_cuda.cpp (+57, -1) (Diff)
/intern/cycles/util/util_cuda.h (+1, -0) (Diff)
/intern/cycles/util/util_types.h (+46, -5) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+8, -4) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+0, -1) (Diff)
/release/scripts/startup/bl_ui/__init__.py (+1, -0) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+10, -1) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/displist.c (+4, -2) (Diff)
/source/blender/blenkernel/intern/editmesh_bvh.c (+6, -7) (Diff)
/source/blender/blenkernel/intern/mesh.c (+4, -1) (Diff)
/source/blender/blenkernel/intern/paint.c (+4, -0) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+2, -3) (Diff)
/source/blender/blenlib/BLI_ghash.h (+1, -1) (Diff)
/source/blender/blenlib/intern/BLI_ghash.c (+6, -4) (Diff)
/source/blender/blenlib/intern/BLI_heap.c (+5, -0) (Diff)
/source/blender/blenlib/intern/BLI_mempool.c (+4, -2) (Diff)
/source/blender/bmesh/bmesh_class.h (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_marking.c (+6, -0) (Diff)
/source/blender/bmesh/intern/bmesh_mesh.c (+2, -0) (Diff)
/source/blender/bmesh/tools/bmesh_path.c (+6, -3) (Diff)
/source/blender/editors/include/ED_mesh.h (+5, -1) (Diff)
/source/blender/editors/include/UI_interface.h (+2, -2) (Diff)
/source/blender/editors/interface/interface.c (+16, -4) (Diff)
/source/blender/editors/interface/interface_handlers.c (+4, -5) (Diff)
/source/blender/editors/interface/interface_intern.h (+1, -1) (Diff)
/source/blender/editors/interface/interface_layout.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_regions.c (+4, -2) (Diff)
/source/blender/editors/mesh/editmesh_select.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+128, -2) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+61, -28) (Diff)
/source/blender/editors/mesh/mesh_intern.h (+1, -0) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+1, -0) (Diff)
/source/blender/editors/object/object_vgroup.c (+5, -5) (Diff)
/source/blender/editors/space_buttons/buttons_intern.h (+0, -3) (Diff)
/source/blender/editors/space_buttons/CMakeLists.txt (+0, -1) (Diff)
/source/blender/editors/space_buttons/space_buttons.c (+7, -12) (Diff)
/source/blender/editors/space_clip/space_clip.c (+1, -1) (Diff)
/source/blender/editors/space_file/filesel.c (+16, -9) (Diff)
/source/blender/editors/space_file/file_intern.h (+2, -2) (Diff)
/source/blender/editors/space_sequencer/sequencer_add.c (+5, -1) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+84, -62) (Diff)
/source/blender/editors/space_view3d/view3d_iterators.c (+1, -1) (Diff)
/source/blender/editors/transform/transform.c (+12, -20) (Diff)
/source/blender/editors/transform/transform.h (+2, -1) (Diff)
/source/blender/editors/transform/transform_conversions.c (+22, -4) (Diff)
/source/blender/editors/transform/transform_generics.c (+19, -13) (Diff)
/source/blender/editors/transform/transform_snap.c (+8, -7) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+2, -1) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+90, -19) (Diff)
/source/blender/render/intern/source/pipeline.c (+14, -6) (Diff)
/source/blender/render/intern/source/shadeinput.c (+4, -0) (Diff)
/source/blender/render/intern/source/zbuf.c (+4, -0) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+10, -10) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+3, -2) (Diff)
/source/gameengine/Converter/KX_BlenderSceneConverter.cpp (+5, -1) (Diff)
/source/gameengine/GameLogic/SCA_IInputDevice.h (+2, -0) (Diff)
/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp (+2, -0) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp (+2, -0) (Diff)
/source/gameengine/Ketsji/KX_KetsjiEngine.cpp (+3, -15) (Diff)
/source/gameengine/Ketsji/KX_KetsjiEngine.h (+0, -1) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+2, -0) (Diff)
/source/gameengine/Ketsji/KX_Scene.cpp (+10, -5) (Diff)
/source/gameengine/Ketsji/KX_Scene.h (+4, -4) (Diff)
/source/gameengine/VideoTexture/ImageRender.cpp (+2, -0) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021