Blender Git Loki
Git Commits -> Revision c366cef
Revision c366cef by Antonis Ryakiotakis (soc-2013-paint) June 28, 2013, 23:58 (GMT) |
Merge trunk -r57861 into soc-2013-paint |
Commit Details:
Full Hash: c366cef05a0df8d602716f119416fb93564d0ee3
SVN Revision: 57867
Parent Commit: cd3f0b5
Lines Changed: +1286, -671
1 Added Path:
/source/blender/editors/sculpt_paint/paint_vertex_proj.c (+242, -0) (View)
127 Modified Paths:
/doc/python_api/examples/bpy.app.translations.py (+1, -1) (Diff)
/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py (+1, -0) (Diff)
/intern/cycles/blender/addon/ui.py (+4, -3) (Diff)
/intern/cycles/blender/blender_curves.cpp (+1, -1) (Diff)
/intern/cycles/device/device_cuda.cpp (+0, -14) (Diff)
/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h (+2, -0) (Diff)
/intern/cycles/kernel/closure/bsdf_phong_ramp.h (+4, -0) (Diff)
/intern/cycles/kernel/kernel_compat_opencl.h (+0, -1) (Diff)
/intern/cycles/kernel/kernel_sse2.cpp (+2, -0) (Diff)
/intern/cycles/kernel/kernel_sse3.cpp (+1, -0) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+6, -5) (Diff)
/intern/cycles/kernel/osl/osl_services.h (+2, -1) (Diff)
/intern/cycles/kernel/osl/osl_shader.cpp (+1, -1) (Diff)
/intern/cycles/kernel/shaders/CMakeLists.txt (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_brick_texture.osl (+2, -2) (Diff)
/intern/cycles/kernel/shaders/SConscript (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_brick.h (+2, -2) (Diff)
/intern/cycles/render/background.cpp (+7, -4) (Diff)
/intern/cycles/render/background.h (+1, -0) (Diff)
/intern/cycles/render/osl.cpp (+11, -2) (Diff)
/intern/cycles/render/scene.h (+0, -1) (Diff)
/intern/cycles/render/shader.cpp (+2, -17) (Diff)
/intern/cycles/util/util_math.h (+1, -1) (Diff)
/intern/cycles/util/util_types.h (+17, -50) (Diff)
/intern/cycles/util/util_vector.h (+20, -0) (Diff)
/intern/ghost/intern/GHOST_SystemCocoa.mm (+4, -2) (Diff)
/intern/ghost/intern/GHOST_WindowWin32.cpp (+5, -0) (Diff)
/intern/locale/boost_locale_wrapper.cpp (+2, -2) (Diff)
/release/datafiles/startup.blend (+0, -0) (Diff)
/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py (+1, -0) (Diff)
/release/scripts/modules/bpy/utils.py (+2, -1) (Diff)
/release/scripts/modules/console/complete_namespace.py (+1, -1) (Diff)
/release/scripts/modules/nodeitems_utils.py (+16, -15) (Diff)
/release/scripts/startup/bl_operators/anim.py (+2, -2) (Diff)
/release/scripts/startup/bl_operators/node.py (+21, -8) (Diff)
/release/scripts/startup/bl_operators/presets.py (+3, -1) (Diff)
/release/scripts/startup/bl_operators/vertexpaint_dirt.py (+1, -0) (Diff)
/release/scripts/startup/bl_operators/view3d.py (+1, -1) (Diff)
/release/scripts/startup/bl_operators/wm.py (+4, -1) (Diff)
/release/scripts/startup/bl_ui/properties_data_mesh.py (+2, -0) (Diff)
/release/scripts/startup/bl_ui/properties_data_modifier.py (+15, -15) (Diff)
/release/scripts/startup/bl_ui/properties_freestyle.py (+14, -14) (Diff)
/release/scripts/startup/bl_ui/properties_game.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_physics_fluid.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_render.py (+2, -1) (Diff)
/release/scripts/startup/bl_ui/space_clip.py (+3, -2) (Diff)
/release/scripts/startup/bl_ui/space_image.py (+2, -3) (Diff)
/release/scripts/startup/bl_ui/space_info.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_node.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_userpref.py (+6, -6) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+9, -3) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+13, -9) (Diff)
/release/scripts/startup/nodeitems_builtins.py (+41, -33) (Diff)
/release/text/readme.html (+5, -5) (Diff)
/source/blender/blenfont/intern/blf.c (+1, -0) (Diff)
/source/blender/blenfont/intern/blf_dir.c (+1, -0) (Diff)
/source/blender/blenfont/intern/blf_font.c (+5, -0) (Diff)
/source/blender/blenfont/intern/blf_glyph.c (+24, -2) (Diff)
/source/blender/blenfont/intern/blf_internal_types.h (+3, -0) (Diff)
/source/blender/blenkernel/BKE_blender.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_DerivedMesh.h (+3, -0) (Diff)
/source/blender/blenkernel/BKE_mball.h (+5, -3) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+17, -20) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+4, -0) (Diff)
/source/blender/blenkernel/intern/effect.c (+0, -6) (Diff)
/source/blender/blenkernel/intern/image_gen.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/lattice.c (+10, -4) (Diff)
/source/blender/blenkernel/intern/mball.c (+39, -3) (Diff)
/source/blender/blenkernel/intern/mesh.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/object.c (+13, -2) (Diff)
/source/blender/blenkernel/intern/tracking.c (+1, -1) (Diff)
/source/blender/blenlib/intern/path_util.c (+13, -4) (Diff)
/source/blender/bmesh/intern/bmesh_polygon.c (+54, -65) (Diff)
/source/blender/bmesh/intern/bmesh_polygon.h (+2, -1) (Diff)
/source/blender/bmesh/operators/bmo_connect.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_subdivide.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_wireframe.c (+1, -0) (Diff)
/source/blender/editors/animation/fmodifier_ui.c (+25, -25) (Diff)
/source/blender/editors/armature/armature_relations.c (+2, -2) (Diff)
/source/blender/editors/armature/armature_skinning.c (+2, -1) (Diff)
/source/blender/editors/armature/meshlaplacian.c (+2, -1) (Diff)
/source/blender/editors/curve/editcurve.c (+10, -9) (Diff)
/source/blender/editors/curve/editfont.c (+1, -1) (Diff)
/source/blender/editors/curve/lorem.c (+2, -2) (Diff)
/source/blender/editors/include/ED_mesh.h (+8, -5) (Diff)
/source/blender/editors/interface/interface_regions.c (+5, -2) (Diff)
/source/blender/editors/interface/interface_widgets.c (+3, -5) (Diff)
/source/blender/editors/interface/resources.c (+1, -0) (Diff)
/source/blender/editors/mesh/editmesh_select.c (+19, -12) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+8, -32) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+8, -12) (Diff)
/source/blender/editors/mesh/meshtools.c (+6, -5) (Diff)
/source/blender/editors/mesh/mesh_intern.h (+0, -1) (Diff)
/source/blender/editors/mesh/mesh_navmesh.c (+2, -1) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+0, -1) (Diff)
/source/blender/editors/object/object_add.c (+1, -1) (Diff)
/source/blender/editors/object/object_hook.c (+11, -1) (Diff)
/source/blender/editors/object/object_lattice.c (+3, -19) (Diff)
/source/blender/editors/object/object_relations.c (+22, -7) (Diff)
/source/blender/editors/object/object_shapekey.c (+8, -3) (Diff)
/source/blender/editors/object/object_vgroup.c (+141, -66) (Diff)
/source/blender/editors/screen/screendump.c (+9, -2) (Diff)
/source/blender/editors/screen/screen_edit.c (+3, -9) (Diff)
/source/blender/editors/screen/screen_ops.c (+3, -4) (Diff)
/source/blender/editors/sculpt_paint/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/sculpt_paint/paint_intern.h (+15, -0) (Diff)
/source/blender/editors/sculpt_paint/paint_vertex.c (+23, -24) (Diff)
/source/blender/editors/space_clip/clip_buttons.c (+15, -15) (Diff)
/source/blender/editors/space_clip/clip_dopesheet_draw.c (+1, -1) (Diff)
/source/blender/editors/space_graph/graph_buttons.c (+1, -1) (Diff)
/source/blender/editors/space_image/image_ops.c (+1, -1) (Diff)
/source/blender/editors/space_script/script_edit.c (+35, -2) (Diff)
/source/blender/editors/space_view3d/view3d_buttons.c (+20, -10) (Diff)
/source/blender/editors/space_view3d/view3d_snap.c (+14, -0) (Diff)
/source/blender/editors/transform/transform_conversions.c (+3, -1) (Diff)
/source/blender/ikplugin/intern/ikplugin_api.c (+2, -1) (Diff)
/source/blender/makesrna/intern/rna_brush.c (+1, -1) (Diff)
/source/blender/python/intern/bpy_rna_array.c (+15, -8) (Diff)
/source/blender/render/intern/source/convertblender.c (+26, -8) (Diff)
/source/blender/render/intern/source/envmap.c (+1, -0) (Diff)
/source/blender/render/intern/source/pipeline.c (+1, -0) (Diff)
/source/blender/render/intern/source/shadeoutput.c (+13, -0) (Diff)
/source/blender/windowmanager/intern/wm_cursors.c (+3, -1) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+2, -2) (Diff)
/source/gameengine/Ketsji/BL_Shader.cpp (+1, -1) (Diff)
/source/tests/bl_run_operators.py (+71, -10) (Diff)
/doc/python_api/examples/bpy.types.WindowManager.popup_menu.py (+1, -0) (Diff)
/intern/cycles/blender/addon/ui.py (+4, -3) (Diff)
/intern/cycles/blender/blender_curves.cpp (+1, -1) (Diff)
/intern/cycles/device/device_cuda.cpp (+0, -14) (Diff)
/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h (+2, -0) (Diff)
/intern/cycles/kernel/closure/bsdf_phong_ramp.h (+4, -0) (Diff)
/intern/cycles/kernel/kernel_compat_opencl.h (+0, -1) (Diff)
/intern/cycles/kernel/kernel_sse2.cpp (+2, -0) (Diff)
/intern/cycles/kernel/kernel_sse3.cpp (+1, -0) (Diff)
/intern/cycles/kernel/osl/osl_services.cpp (+6, -5) (Diff)
/intern/cycles/kernel/osl/osl_services.h (+2, -1) (Diff)
/intern/cycles/kernel/osl/osl_shader.cpp (+1, -1) (Diff)
/intern/cycles/kernel/shaders/CMakeLists.txt (+1, -1) (Diff)
/intern/cycles/kernel/shaders/node_brick_texture.osl (+2, -2) (Diff)
/intern/cycles/kernel/shaders/SConscript (+1, -1) (Diff)
/intern/cycles/kernel/svm/svm_brick.h (+2, -2) (Diff)
/intern/cycles/render/background.cpp (+7, -4) (Diff)
/intern/cycles/render/background.h (+1, -0) (Diff)
/intern/cycles/render/osl.cpp (+11, -2) (Diff)
/intern/cycles/render/scene.h (+0, -1) (Diff)
/intern/cycles/render/shader.cpp (+2, -17) (Diff)
/intern/cycles/util/util_math.h (+1, -1) (Diff)
/intern/cycles/util/util_types.h (+17, -50) (Diff)
/intern/cycles/util/util_vector.h (+20, -0) (Diff)
/intern/ghost/intern/GHOST_SystemCocoa.mm (+4, -2) (Diff)
/intern/ghost/intern/GHOST_WindowWin32.cpp (+5, -0) (Diff)
/intern/locale/boost_locale_wrapper.cpp (+2, -2) (Diff)
/release/datafiles/startup.blend (+0, -0) (Diff)
/release/scripts/modules/bl_i18n_utils/utils_languages_menu.py (+1, -0) (Diff)
/release/scripts/modules/bpy/utils.py (+2, -1) (Diff)
/release/scripts/modules/console/complete_namespace.py (+1, -1) (Diff)
/release/scripts/modules/nodeitems_utils.py (+16, -15) (Diff)
/release/scripts/startup/bl_operators/anim.py (+2, -2) (Diff)
/release/scripts/startup/bl_operators/node.py (+21, -8) (Diff)
/release/scripts/startup/bl_operators/presets.py (+3, -1) (Diff)
/release/scripts/startup/bl_operators/vertexpaint_dirt.py (+1, -0) (Diff)
/release/scripts/startup/bl_operators/view3d.py (+1, -1) (Diff)
/release/scripts/startup/bl_operators/wm.py (+4, -1) (Diff)
/release/scripts/startup/bl_ui/properties_data_mesh.py (+2, -0) (Diff)
/release/scripts/startup/bl_ui/properties_data_modifier.py (+15, -15) (Diff)
/release/scripts/startup/bl_ui/properties_freestyle.py (+14, -14) (Diff)
/release/scripts/startup/bl_ui/properties_game.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_physics_fluid.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_render.py (+2, -1) (Diff)
/release/scripts/startup/bl_ui/space_clip.py (+3, -2) (Diff)
/release/scripts/startup/bl_ui/space_image.py (+2, -3) (Diff)
/release/scripts/startup/bl_ui/space_info.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_node.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_userpref.py (+6, -6) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+9, -3) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+13, -9) (Diff)
/release/scripts/startup/nodeitems_builtins.py (+41, -33) (Diff)
/release/text/readme.html (+5, -5) (Diff)
/source/blender/blenfont/intern/blf.c (+1, -0) (Diff)
/source/blender/blenfont/intern/blf_dir.c (+1, -0) (Diff)
/source/blender/blenfont/intern/blf_font.c (+5, -0) (Diff)
/source/blender/blenfont/intern/blf_glyph.c (+24, -2) (Diff)
/source/blender/blenfont/intern/blf_internal_types.h (+3, -0) (Diff)
/source/blender/blenkernel/BKE_blender.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_DerivedMesh.h (+3, -0) (Diff)
/source/blender/blenkernel/BKE_mball.h (+5, -3) (Diff)
/source/blender/blenkernel/intern/depsgraph.c (+17, -20) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+4, -0) (Diff)
/source/blender/blenkernel/intern/effect.c (+0, -6) (Diff)
/source/blender/blenkernel/intern/image_gen.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/lattice.c (+10, -4) (Diff)
/source/blender/blenkernel/intern/mball.c (+39, -3) (Diff)
/source/blender/blenkernel/intern/mesh.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/object.c (+13, -2) (Diff)
/source/blender/blenkernel/intern/tracking.c (+1, -1) (Diff)
/source/blender/blenlib/intern/path_util.c (+13, -4) (Diff)
/source/blender/bmesh/intern/bmesh_polygon.c (+54, -65) (Diff)
/source/blender/bmesh/intern/bmesh_polygon.h (+2, -1) (Diff)
/source/blender/bmesh/operators/bmo_connect.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_subdivide.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_wireframe.c (+1, -0) (Diff)
/source/blender/editors/animation/fmodifier_ui.c (+25, -25) (Diff)
/source/blender/editors/armature/armature_relations.c (+2, -2) (Diff)
/source/blender/editors/armature/armature_skinning.c (+2, -1) (Diff)
/source/blender/editors/armature/meshlaplacian.c (+2, -1) (Diff)
/source/blender/editors/curve/editcurve.c (+10, -9) (Diff)
/source/blender/editors/curve/editfont.c (+1, -1) (Diff)
/source/blender/editors/curve/lorem.c (+2, -2) (Diff)
/source/blender/editors/include/ED_mesh.h (+8, -5) (Diff)
/source/blender/editors/interface/interface_regions.c (+5, -2) (Diff)
/source/blender/editors/interface/interface_widgets.c (+3, -5) (Diff)
/source/blender/editors/interface/resources.c (+1, -0) (Diff)
/source/blender/editors/mesh/editmesh_select.c (+19, -12) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+8, -32) (Diff)
/source/blender/editors/mesh/editmesh_utils.c (+8, -12) (Diff)
/source/blender/editors/mesh/meshtools.c (+6, -5) (Diff)
/source/blender/editors/mesh/mesh_intern.h (+0, -1) (Diff)
/source/blender/editors/mesh/mesh_navmesh.c (+2, -1) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+0, -1) (Diff)
/source/blender/editors/object/object_add.c (+1, -1) (Diff)
/source/blender/editors/object/object_hook.c (+11, -1) (Diff)
/source/blender/editors/object/object_lattice.c (+3, -19) (Diff)
/source/blender/editors/object/object_relations.c (+22, -7) (Diff)
/source/blender/editors/object/object_shapekey.c (+8, -3) (Diff)
/source/blender/editors/object/object_vgroup.c (+141, -66) (Diff)
/source/blender/editors/screen/screendump.c (+9, -2) (Diff)
/source/blender/editors/screen/screen_edit.c (+3, -9) (Diff)
/source/blender/editors/screen/screen_ops.c (+3, -4) (Diff)
/source/blender/editors/sculpt_paint/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/sculpt_paint/paint_intern.h (+15, -0) (Diff)
/source/blender/editors/sculpt_paint/paint_vertex.c (+23, -24) (Diff)
/source/blender/editors/space_clip/clip_buttons.c (+15, -15) (Diff)
/source/blender/editors/space_clip/clip_dopesheet_draw.c (+1, -1) (Diff)
/source/blender/editors/space_graph/graph_buttons.c (+1, -1) (Diff)
/source/blender/editors/space_image/image_ops.c (+1, -1) (Diff)
/source/blender/editors/space_script/script_edit.c (+35, -2) (Diff)
/source/blender/editors/space_view3d/view3d_buttons.c (+20, -10) (Diff)
/source/blender/editors/space_view3d/view3d_snap.c (+14, -0) (Diff)
/source/blender/editors/transform/transform_conversions.c (+3, -1) (Diff)
/source/blender/ikplugin/intern/ikplugin_api.c (+2, -1) (Diff)
/source/blender/makesrna/intern/rna_brush.c (+1, -1) (Diff)
/source/blender/python/intern/bpy_rna_array.c (+15, -8) (Diff)
/source/blender/render/intern/source/convertblender.c (+26, -8) (Diff)
/source/blender/render/intern/source/envmap.c (+1, -0) (Diff)
/source/blender/render/intern/source/pipeline.c (+1, -0) (Diff)
/source/blender/render/intern/source/shadeoutput.c (+13, -0) (Diff)
/source/blender/windowmanager/intern/wm_cursors.c (+3, -1) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+2, -2) (Diff)
/source/gameengine/Ketsji/BL_Shader.cpp (+1, -1) (Diff)
/source/tests/bl_run_operators.py (+71, -10) (Diff)