Blender Git Commit Log
Git Commits -> Revision ccde18b
Revision ccde18b by Antonis Ryakiotakis (soc-2013-paint) July 15, 2013, 16:17 (GMT) |
Merge trunk -r58270 into soc-2013-paint |
Commit Details:
Full Hash: ccde18bd5453f0fdd307cd231f0e827f55c35a5a
SVN Revision: 58275
Parent Commit: 2a757dd
Lines Changed: +764, -397
95 Modified Paths:
/build_files/cmake/macros.cmake (+3, -1) (Diff)
/CMakeLists.txt (+14, -0) (Diff)
/extern/libredcode/codec.c (+22, -0) (Diff)
/extern/libredcode/codec.h (+22, -0) (Diff)
/extern/libredcode/debayer.c (+22, -0) (Diff)
/extern/libredcode/debayer.h (+22, -0) (Diff)
/extern/libredcode/format.c (+22, -0) (Diff)
/extern/libredcode/format.h (+22, -0) (Diff)
/intern/bsp/CMakeLists.txt (+1, -1) (Diff)
/intern/cycles/blender/blender_mesh.cpp (+27, -13) (Diff)
/intern/cycles/blender/blender_sync.h (+1, -0) (Diff)
/intern/cycles/render/film.cpp (+3, -0) (Diff)
/intern/cycles/render/light.cpp (+2, -2) (Diff)
/intern/cycles/render/mesh.cpp (+12, -0) (Diff)
/intern/cycles/render/mesh.h (+1, -0) (Diff)
/intern/cycles/render/tables.cpp (+1, -1) (Diff)
/intern/iksolver/CMakeLists.txt (+1, -2) (Diff)
/source/blender/blenkernel/BKE_dynamicpaint.h (+4, -3) (Diff)
/source/blender/blenkernel/BKE_mesh.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_sequencer.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/brush.c (+2, -1) (Diff)
/source/blender/blenkernel/intern/customdata.c (+13, -10) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+1, -8) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+14, -13) (Diff)
/source/blender/blenkernel/intern/effect.c (+7, -4) (Diff)
/source/blender/blenkernel/intern/font.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/image.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/mesh.c (+16, -2) (Diff)
/source/blender/blenkernel/intern/particle.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+54, -12) (Diff)
/source/blender/blenkernel/intern/pointcache.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/scene.c (+10, -0) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+14, -2) (Diff)
/source/blender/blenkernel/intern/smoke.c (+3, -1) (Diff)
/source/blender/blenlib/BLI_listbase.h (+1, -1) (Diff)
/source/blender/blenlib/BLI_string.h (+2, -2) (Diff)
/source/blender/blenlib/intern/listbase.c (+2, -2) (Diff)
/source/blender/blenlib/intern/string.c (+21, -7) (Diff)
/source/blender/blenlib/intern/string_utf8.c (+26, -5) (Diff)
/source/blender/collada/AnimationImporter.cpp (+14, -7) (Diff)
/source/blender/collada/ArmatureImporter.cpp (+5, -10) (Diff)
/source/blender/collada/ArmatureImporter.h (+1, -5) (Diff)
/source/blender/collada/DocumentImporter.cpp (+13, -10) (Diff)
/source/blender/collada/TransformWriter.cpp (+12, -24) (Diff)
/source/blender/compositor/nodes/COM_TextureNode.cpp (+4, -0) (Diff)
/source/blender/compositor/operations/COM_KeyingScreenOperation.h (+2, -1) (Diff)
/source/blender/compositor/operations/COM_TextureOperation.cpp (+3, -1) (Diff)
/source/blender/compositor/operations/COM_TextureOperation.h (+2, -0) (Diff)
/source/blender/compositor/operations/COM_TrackPositionOperation.h (+3, -2) (Diff)
/source/blender/editors/armature/armature_select.c (+29, -19) (Diff)
/source/blender/editors/curve/editfont.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_panel.c (+1, -1) (Diff)
/source/blender/editors/mesh/mesh_data.c (+8, -84) (Diff)
/source/blender/editors/object/object_transform.c (+26, -4) (Diff)
/source/blender/editors/physics/dynamicpaint_ops.c (+1, -1) (Diff)
/source/blender/editors/space_clip/clip_ops.c (+3, -2) (Diff)
/source/blender/editors/space_file/filelist.c (+1, -4) (Diff)
/source/blender/editors/space_image/image_ops.c (+31, -14) (Diff)
/source/blender/editors/space_sequencer/sequencer_add.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+13, -2) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+20, -6) (Diff)
/source/blender/editors/space_view3d/view3d_select.c (+5, -5) (Diff)
/source/blender/editors/transform/transform_orientations.c (+3, -3) (Diff)
/source/blender/imbuf/intern/cineon/logImageCore.c (+83, -34) (Diff)
/source/blender/makesdna/DNA_particle_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_dynamicpaint.c (+3, -3) (Diff)
/source/blender/makesrna/intern/rna_main_api.c (+4, -0) (Diff)
/source/blender/makesrna/intern/rna_particle.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_texture_api.c (+3, -1) (Diff)
/source/blender/modifiers/intern/MOD_displace.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_screw.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_skin.c (+2, -2) (Diff)
/source/blender/modifiers/intern/MOD_util.c (+8, -2) (Diff)
/source/blender/modifiers/intern/MOD_util.h (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_warp.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_wave.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_weightvg_util.c (+4, -1) (Diff)
/source/blender/render/extern/include/RE_shader_ext.h (+4, -3) (Diff)
/source/blender/render/intern/source/render_texture.c (+27, -11) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+3, -4) (Diff)
/source/gameengine/BlenderRoutines/CMakeLists.txt (+1, -1) (Diff)
/source/gameengine/Converter/CMakeLists.txt (+1, -1) (Diff)
/source/gameengine/Expressions/CMakeLists.txt (+1, -2) (Diff)
/source/gameengine/GameLogic/CMakeLists.txt (+1, -2) (Diff)
/source/gameengine/GamePlayer/common/CMakeLists.txt (+2, -2) (Diff)
/source/gameengine/GamePlayer/ghost/CMakeLists.txt (+2, -2) (Diff)
/source/gameengine/Ketsji/CMakeLists.txt (+3, -3) (Diff)
/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt (+1, -2) (Diff)
/source/gameengine/Network/CMakeLists.txt (+1, -2) (Diff)
/source/gameengine/Physics/Bullet/CMakeLists.txt (+1, -1) (Diff)
/source/gameengine/Physics/Dummy/CMakeLists.txt (+1, -2) (Diff)
/source/gameengine/Rasterizer/CMakeLists.txt (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt (+1, -1) (Diff)
/source/gameengine/SceneGraph/CMakeLists.txt (+1, -2) (Diff)
/source/gameengine/VideoTexture/CMakeLists.txt (+1, -1) (Diff)
/CMakeLists.txt (+14, -0) (Diff)
/extern/libredcode/codec.c (+22, -0) (Diff)
/extern/libredcode/codec.h (+22, -0) (Diff)
/extern/libredcode/debayer.c (+22, -0) (Diff)
/extern/libredcode/debayer.h (+22, -0) (Diff)
/extern/libredcode/format.c (+22, -0) (Diff)
/extern/libredcode/format.h (+22, -0) (Diff)
/intern/bsp/CMakeLists.txt (+1, -1) (Diff)
/intern/cycles/blender/blender_mesh.cpp (+27, -13) (Diff)
/intern/cycles/blender/blender_sync.h (+1, -0) (Diff)
/intern/cycles/render/film.cpp (+3, -0) (Diff)
/intern/cycles/render/light.cpp (+2, -2) (Diff)
/intern/cycles/render/mesh.cpp (+12, -0) (Diff)
/intern/cycles/render/mesh.h (+1, -0) (Diff)
/intern/cycles/render/tables.cpp (+1, -1) (Diff)
/intern/iksolver/CMakeLists.txt (+1, -2) (Diff)
/source/blender/blenkernel/BKE_dynamicpaint.h (+4, -3) (Diff)
/source/blender/blenkernel/BKE_mesh.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_sequencer.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/brush.c (+2, -1) (Diff)
/source/blender/blenkernel/intern/customdata.c (+13, -10) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+1, -8) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+14, -13) (Diff)
/source/blender/blenkernel/intern/effect.c (+7, -4) (Diff)
/source/blender/blenkernel/intern/font.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/image.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/mesh.c (+16, -2) (Diff)
/source/blender/blenkernel/intern/particle.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+54, -12) (Diff)
/source/blender/blenkernel/intern/pointcache.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/scene.c (+10, -0) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+14, -2) (Diff)
/source/blender/blenkernel/intern/smoke.c (+3, -1) (Diff)
/source/blender/blenlib/BLI_listbase.h (+1, -1) (Diff)
/source/blender/blenlib/BLI_string.h (+2, -2) (Diff)
/source/blender/blenlib/intern/listbase.c (+2, -2) (Diff)
/source/blender/blenlib/intern/string.c (+21, -7) (Diff)
/source/blender/blenlib/intern/string_utf8.c (+26, -5) (Diff)
/source/blender/collada/AnimationImporter.cpp (+14, -7) (Diff)
/source/blender/collada/ArmatureImporter.cpp (+5, -10) (Diff)
/source/blender/collada/ArmatureImporter.h (+1, -5) (Diff)
/source/blender/collada/DocumentImporter.cpp (+13, -10) (Diff)
/source/blender/collada/TransformWriter.cpp (+12, -24) (Diff)
/source/blender/compositor/nodes/COM_TextureNode.cpp (+4, -0) (Diff)
/source/blender/compositor/operations/COM_KeyingScreenOperation.h (+2, -1) (Diff)
/source/blender/compositor/operations/COM_TextureOperation.cpp (+3, -1) (Diff)
/source/blender/compositor/operations/COM_TextureOperation.h (+2, -0) (Diff)
/source/blender/compositor/operations/COM_TrackPositionOperation.h (+3, -2) (Diff)
/source/blender/editors/armature/armature_select.c (+29, -19) (Diff)
/source/blender/editors/curve/editfont.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_panel.c (+1, -1) (Diff)
/source/blender/editors/mesh/mesh_data.c (+8, -84) (Diff)
/source/blender/editors/object/object_transform.c (+26, -4) (Diff)
/source/blender/editors/physics/dynamicpaint_ops.c (+1, -1) (Diff)
/source/blender/editors/space_clip/clip_ops.c (+3, -2) (Diff)
/source/blender/editors/space_file/filelist.c (+1, -4) (Diff)
/source/blender/editors/space_image/image_ops.c (+31, -14) (Diff)
/source/blender/editors/space_sequencer/sequencer_add.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+13, -2) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+20, -6) (Diff)
/source/blender/editors/space_view3d/view3d_select.c (+5, -5) (Diff)
/source/blender/editors/transform/transform_orientations.c (+3, -3) (Diff)
/source/blender/imbuf/intern/cineon/logImageCore.c (+83, -34) (Diff)
/source/blender/makesdna/DNA_particle_types.h (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_dynamicpaint.c (+3, -3) (Diff)
/source/blender/makesrna/intern/rna_main_api.c (+4, -0) (Diff)
/source/blender/makesrna/intern/rna_particle.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_texture_api.c (+3, -1) (Diff)
/source/blender/modifiers/intern/MOD_displace.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_screw.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_skin.c (+2, -2) (Diff)
/source/blender/modifiers/intern/MOD_util.c (+8, -2) (Diff)
/source/blender/modifiers/intern/MOD_util.h (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_warp.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_wave.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_weightvg_util.c (+4, -1) (Diff)
/source/blender/render/extern/include/RE_shader_ext.h (+4, -3) (Diff)
/source/blender/render/intern/source/render_texture.c (+27, -11) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+3, -4) (Diff)
/source/gameengine/BlenderRoutines/CMakeLists.txt (+1, -1) (Diff)
/source/gameengine/Converter/CMakeLists.txt (+1, -1) (Diff)
/source/gameengine/Expressions/CMakeLists.txt (+1, -2) (Diff)
/source/gameengine/GameLogic/CMakeLists.txt (+1, -2) (Diff)
/source/gameengine/GamePlayer/common/CMakeLists.txt (+2, -2) (Diff)
/source/gameengine/GamePlayer/ghost/CMakeLists.txt (+2, -2) (Diff)
/source/gameengine/Ketsji/CMakeLists.txt (+3, -3) (Diff)
/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt (+1, -2) (Diff)
/source/gameengine/Network/CMakeLists.txt (+1, -2) (Diff)
/source/gameengine/Physics/Bullet/CMakeLists.txt (+1, -1) (Diff)
/source/gameengine/Physics/Dummy/CMakeLists.txt (+1, -2) (Diff)
/source/gameengine/Rasterizer/CMakeLists.txt (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt (+1, -1) (Diff)
/source/gameengine/SceneGraph/CMakeLists.txt (+1, -2) (Diff)
/source/gameengine/VideoTexture/CMakeLists.txt (+1, -1) (Diff)