Blender Git Commit Log

Git Commits -> Revision beba801

Revision beba801 by Sergey Sharybin (master)
September 15, 2012, 06:24 (GMT)
Merging r50602 through r50617 form trunk into soc-2011-tomato

Commit Details:

Full Hash: beba8014e444d154124f3739f2f3edbf58c972e6
SVN Revision: 50618
Parent Commit: a803f5d
Lines Changed: +910, -720

3 Added Paths:

/intern/cycles/kernel/osl/nodes/node_object_info.osl (+33, -0) (View)
/intern/cycles/kernel/osl/nodes/node_particle_info.osl (+39, -0) (View)
/source/blender/python/intern/bpy_library.h (+32, -0) (View)

103 Modified Paths:

/build_files/cmake/macros.cmake (+1, -0) (Diff)
/CMakeLists.txt (+6, -2) (Diff)
/intern/audaspace/intern/AUD_C-API.cpp (+262, -306) (Diff)
/intern/audaspace/intern/AUD_C-API.h (+86, -80) (Diff)
/intern/cycles/kernel/osl/nodes/CMakeLists.txt (+2, -0) (Diff)
/intern/cycles/kernel/osl/osl_globals.h (+1, -1) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+171, -58) (Diff)
/intern/cycles/kernel/osl/osl_services.h (+6, -6) (Diff)
/intern/ghost/intern/GHOST_WindowCarbon.cpp (+1, -1) (Diff)
/intern/ghost/intern/GHOST_WindowWin32.cpp (+12, -17) (Diff)
/intern/ghost/intern/GHOST_WindowWin32.h (+2, -2) (Diff)
/intern/mikktspace/mikktspace.c (+1, -1) (Diff)
/intern/raskter/raskter.c (+5, -5) (Diff)
/intern/utfconv/utfconv.c (+5, -3) (Diff)
/source/blender/blenkernel/BKE_colortools.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_customdata.h (+2, -0) (Diff)
/source/blender/blenkernel/BKE_mask.h (+4, -3) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+1, -3) (Diff)
/source/blender/blenkernel/intern/blender.c (+2, -4) (Diff)
/source/blender/blenkernel/intern/cloth.c (+3, -32) (Diff)
/source/blender/blenkernel/intern/dynamicpaint.c (+12, -9) (Diff)
/source/blender/blenkernel/intern/implicit.c (+10, -8) (Diff)
/source/blender/blenkernel/intern/mask.c (+3, -2) (Diff)
/source/blender/blenkernel/intern/mask_rasterize.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/movieclip.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/object.c (+22, -12) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+2, -3) (Diff)
/source/blender/blenkernel/intern/seqmodifier.c (+16, -16) (Diff)
/source/blender/blenkernel/intern/smoke.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/text.c (+0, -24) (Diff)
/source/blender/blenkernel/intern/texture.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/tracking.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/writeffmpeg.c (+1, -1) (Diff)
/source/blender/blenlib/BLI_math_color.h (+2, -0) (Diff)
/source/blender/blenlib/intern/math_color.c (+6, -0) (Diff)
/source/blender/blenlib/intern/md5.c (+2, -0) (Diff)
/source/blender/blenlib/intern/pbvh.c (+1, -1) (Diff)
/source/blender/blenlib/intern/voronoi.c (+6, -6) (Diff)
/source/blender/blenlib/intern/winstuff.c (+1, -1) (Diff)
/source/blender/blenloader/BLO_readfile.h (+3, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+3, -7) (Diff)
/source/blender/bmesh/operators/bmo_dissolve.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_hull.c (+3, -1) (Diff)
/source/blender/bmesh/operators/bmo_removedoubles.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_wireframe.c (+1, -1) (Diff)
/source/blender/bmesh/tools/BME_bevel.c (+5, -5) (Diff)
/source/blender/collada/ImageExporter.cpp (+3, -2) (Diff)
/source/blender/editors/animation/keyframing.c (+1, -1) (Diff)
/source/blender/editors/armature/poseobject.c (+3, -2) (Diff)
/source/blender/editors/include/ED_mask.h (+2, -2) (Diff)
/source/blender/editors/include/ED_sequencer.h (+1, -1) (Diff)
/source/blender/editors/include/ED_util.h (+2, -0) (Diff)
/source/blender/editors/interface/interface_ops.c (+1, -1) (Diff)
/source/blender/editors/io/io_ops.c (+2, -0) (Diff)
/source/blender/editors/mask/mask_editaction.c (+1, -0) (Diff)
/source/blender/editors/object/object_add.c (+1, -1) (Diff)
/source/blender/editors/physics/physics_fluid.c (+2, -2) (Diff)
/source/blender/editors/sculpt_paint/paint_image.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_ops.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_stroke.c (+4, -1) (Diff)
/source/blender/editors/sculpt_paint/paint_vertex.c (+1, -1) (Diff)
/source/blender/editors/sculpt_paint/sculpt_uv.c (+2, -2) (Diff)
/source/blender/editors/space_clip/clip_graph_draw.c (+2, -2) (Diff)
/source/blender/editors/space_clip/clip_graph_ops.c (+1, -1) (Diff)
/source/blender/editors/space_image/image_ops.c (+1, -1) (Diff)
/source/blender/editors/space_nla/nla_edit.c (+1, -1) (Diff)
/source/blender/editors/space_node/drawnode.c (+4, -4) (Diff)
/source/blender/editors/space_node/space_node.c (+1, -0) (Diff)
/source/blender/editors/space_sequencer/sequencer_ops.c (+1, -0) (Diff)
/source/blender/editors/space_sequencer/sequencer_view.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+3, -3) (Diff)
/source/blender/editors/space_view3d/view3d_select.c (+1, -1) (Diff)
/source/blender/editors/uvedit/uvedit_ops.c (+1, -1) (Diff)
/source/blender/imbuf/intern/divers.c (+1, -1) (Diff)
/source/blender/imbuf/intern/indexer_dv.c (+1, -1) (Diff)
/source/blender/imbuf/intern/util.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_weightvgproximity.c (+1, -1) (Diff)
/source/blender/nodes/intern/node_common.c (+1, -1) (Diff)
/source/blender/nodes/intern/node_util.h (+1, -1) (Diff)
/source/blender/nodes/texture/node_texture_util.h (+2, -0) (Diff)
/source/blender/python/bmesh/bmesh_py_ops.c (+3, -1) (Diff)
/source/blender/python/intern/bpy.c (+2, -2) (Diff)
/source/blender/python/intern/bpy.h (+4, -1) (Diff)
/source/blender/python/intern/bpy_app_ffmpeg.c (+1, -4) (Diff)
/source/blender/python/intern/bpy_app_handlers.c (+2, -0) (Diff)
/source/blender/python/intern/bpy_interface_atexit.c (+1, -0) (Diff)
/source/blender/python/intern/bpy_library.c (+2, -1) (Diff)
/source/blender/python/intern/bpy_rna.c (+10, -8) (Diff)
/source/blender/python/intern/bpy_rna.h (+4, -0) (Diff)
/source/blender/python/intern/CMakeLists.txt (+1, -0) (Diff)
/source/blender/python/intern/gpu.c (+1, -2) (Diff)
/source/blender/python/intern/stubs.c (+7, -4) (Diff)
/source/blender/render/intern/include/zbuf.h (+5, -0) (Diff)
/source/blender/render/intern/source/convertblender.c (+1, -0) (Diff)
/source/blender/render/intern/source/render_texture.c (+7, -4) (Diff)
/source/blender/render/intern/source/strand.c (+0, -5) (Diff)
/source/blender/render/intern/source/texture_ocean.c (+2, -0) (Diff)
/source/blender/render/intern/source/zbuf.c (+3, -3) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+1, -2) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_playanim.c (+5, -3) (Diff)
/source/blender/windowmanager/WM_api.h (+2, -0) (Diff)
/source/creator/creator.c (+1, -4) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021