Merging r50457 through r50469 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 7 Sep 2012 12:53:41 +0000 (12:53 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 7 Sep 2012 12:53:41 +0000 (12:53 +0000)
commit62076905a3e732e331a9c6a157f861a09b4ebbec
treeb5f09cd1b82e1a88e3036f4e9f6b0e879ac6745d
parenta913101b4bd2369d757d623b70ab7477874d8849
Merging r50457 through r50469 from trunk into soc-2011-tomato
35 files changed:
intern/cycles/kernel/CMakeLists.txt
intern/cycles/kernel/kernel_attribute.h [new file with mode: 0644]
intern/cycles/kernel/kernel_triangle.h
intern/cycles/kernel/kernel_types.h
intern/cycles/render/attribute.h
intern/cycles/render/mesh.cpp
intern/cycles/render/scene.h
intern/cycles/util/CMakeLists.txt
intern/cycles/util/util_attribute.cpp [new file with mode: 0644]
intern/cycles/util/util_attribute.h [new file with mode: 0644]
intern/cycles/util/util_types.h
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/armature/poseobject.c
source/blender/editors/include/ED_mesh.h
source/blender/editors/include/ED_screen.h
source/blender/editors/mesh/editface.c
source/blender/editors/mesh/editmesh_bvh.c
source/blender/editors/mesh/editmesh_rip.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_slide.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/editmesh_utils.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/mesh/meshtools.c
source/blender/editors/object/object_constraint.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_utils.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform.c