Merging r50602 through r50617 form trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 15 Sep 2012 06:24:48 +0000 (06:24 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 15 Sep 2012 06:24:48 +0000 (06:24 +0000)
commitbeba8014e444d154124f3739f2f3edbf58c972e6
tree015904356120d45aa53dbca0e6feff002d3b4043
parenta803f5d6d05159be5f94673c688dad32231c3d96
Merging r50602 through r50617 form trunk into soc-2011-tomato
106 files changed:
CMakeLists.txt
build_files/cmake/macros.cmake
intern/audaspace/intern/AUD_C-API.cpp
intern/audaspace/intern/AUD_C-API.h
intern/cycles/kernel/osl/nodes/CMakeLists.txt
intern/cycles/kernel/osl/nodes/node_object_info.osl [new file with mode: 0644]
intern/cycles/kernel/osl/nodes/node_particle_info.osl [new file with mode: 0644]
intern/cycles/kernel/osl/osl_globals.h
intern/cycles/kernel/osl/osl_services.cpp
intern/cycles/kernel/osl/osl_services.h
intern/ghost/intern/GHOST_WindowCarbon.cpp
intern/ghost/intern/GHOST_WindowWin32.cpp
intern/ghost/intern/GHOST_WindowWin32.h
intern/mikktspace/mikktspace.c
intern/raskter/raskter.c
intern/utfconv/utfconv.c
source/blender/blenkernel/BKE_colortools.h
source/blender/blenkernel/BKE_customdata.h
source/blender/blenkernel/BKE_mask.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/implicit.c
source/blender/blenkernel/intern/mask.c
source/blender/blenkernel/intern/mask_rasterize.c
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/seqmodifier.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenkernel/intern/text.c
source/blender/blenkernel/intern/texture.c
source/blender/blenkernel/intern/tracking.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/blenlib/BLI_math_color.h
source/blender/blenlib/intern/math_color.c
source/blender/blenlib/intern/md5.c
source/blender/blenlib/intern/pbvh.c
source/blender/blenlib/intern/voronoi.c
source/blender/blenlib/intern/winstuff.c
source/blender/blenloader/BLO_readfile.h
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/operators/bmo_dissolve.c
source/blender/bmesh/operators/bmo_hull.c
source/blender/bmesh/operators/bmo_removedoubles.c
source/blender/bmesh/operators/bmo_wireframe.c
source/blender/bmesh/tools/BME_bevel.c
source/blender/collada/ImageExporter.cpp
source/blender/editors/animation/keyframing.c
source/blender/editors/armature/poseobject.c
source/blender/editors/include/ED_mask.h
source/blender/editors/include/ED_sequencer.h
source/blender/editors/include/ED_util.h
source/blender/editors/interface/interface_ops.c
source/blender/editors/io/io_ops.c
source/blender/editors/mask/mask_editaction.c
source/blender/editors/object/object_add.c
source/blender/editors/physics/physics_fluid.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_ops.c
source/blender/editors/sculpt_paint/paint_stroke.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt_uv.c
source/blender/editors/space_clip/clip_graph_draw.c
source/blender/editors/space_clip/clip_graph_ops.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_nla/nla_edit.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_sequencer/sequencer_ops.c
source/blender/editors/space_sequencer/sequencer_view.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/imbuf/intern/divers.c
source/blender/imbuf/intern/indexer_dv.c
source/blender/imbuf/intern/util.c
source/blender/modifiers/intern/MOD_weightvgproximity.c
source/blender/nodes/intern/node_common.c
source/blender/nodes/intern/node_util.h
source/blender/nodes/texture/node_texture_util.h
source/blender/python/bmesh/bmesh_py_ops.c
source/blender/python/intern/CMakeLists.txt
source/blender/python/intern/bpy.c
source/blender/python/intern/bpy.h
source/blender/python/intern/bpy_app_ffmpeg.c
source/blender/python/intern/bpy_app_handlers.c
source/blender/python/intern/bpy_interface_atexit.c
source/blender/python/intern/bpy_library.c
source/blender/python/intern/bpy_library.h [new file with mode: 0644]
source/blender/python/intern/bpy_rna.c
source/blender/python/intern/bpy_rna.h
source/blender/python/intern/gpu.c
source/blender/python/intern/stubs.c
source/blender/render/intern/include/zbuf.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/render_texture.c
source/blender/render/intern/source/strand.c
source/blender/render/intern/source/texture_ocean.c
source/blender/render/intern/source/zbuf.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_playanim.c
source/creator/creator.c