Blender Git Commit Log
Git Commits -> Revision 02883a1
Revision 02883a1 by Antonis Ryakiotakis (soc-2013-paint) June 26, 2013, 15:19 (GMT) |
merge with trunk -r 57777 |
Commit Details:
Full Hash: 02883a1f4e4f63ba23eeb9a73b28f52fad6bdbba
SVN Revision: 57778
Parent Commit: 1049a8f
Lines Changed: +1192, -692
1 Deleted Path:
/source/blender/blenkernel/intern/script.c (+0, -45)
145 Modified Paths:
/build_files/build_environment/install_deps.sh (+2, -2) (Diff)
/intern/cycles/blender/addon/ui.py (+22, -2) (Diff)
/intern/cycles/blender/blender_session.cpp (+13, -7) (Diff)
/intern/cycles/device/device_opencl.cpp (+6, -0) (Diff)
/intern/cycles/render/session.cpp (+8, -4) (Diff)
/release/datafiles/startup.blend (+0, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+2, -2) (Diff)
/source/blender/blenkernel/BKE_global.h (+1, -2) (Diff)
/source/blender/blenkernel/BKE_lattice.h (+3, -0) (Diff)
/source/blender/blenkernel/BKE_mesh.h (+14, -6) (Diff)
/source/blender/blenkernel/BKE_particle.h (+2, -0) (Diff)
/source/blender/blenkernel/BKE_screen.h (+2, -2) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+0, -1) (Diff)
/source/blender/blenkernel/intern/anim.c (+5, -2) (Diff)
/source/blender/blenkernel/intern/autoexec.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/bpath.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+4, -1) (Diff)
/source/blender/blenkernel/intern/deform.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/key.c (+27, -0) (Diff)
/source/blender/blenkernel/intern/lattice.c (+14, -1) (Diff)
/source/blender/blenkernel/intern/mball.c (+5, -3) (Diff)
/source/blender/blenkernel/intern/mesh.c (+74, -10) (Diff)
/source/blender/blenkernel/intern/node.c (+33, -27) (Diff)
/source/blender/blenkernel/intern/packedFile.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/particle.c (+16, -0) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+7, -7) (Diff)
/source/blender/blenkernel/intern/tracking.c (+1, -1) (Diff)
/source/blender/blenlib/BLI_scanfill.h (+0, -1) (Diff)
/source/blender/blenlib/intern/fileops.c (+1, -1) (Diff)
/source/blender/blenlib/intern/graph.c (+1, -1) (Diff)
/source/blender/blenlib/intern/math_color_inline.c (+1, -1) (Diff)
/source/blender/blenlib/intern/math_geom.c (+1, -1) (Diff)
/source/blender/blenlib/intern/scanfill.c (+1, -18) (Diff)
/source/blender/blenloader/intern/readfile.c (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_edgeloop.c (+2, -2) (Diff)
/source/blender/bmesh/intern/bmesh_iterators.h (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_mesh_conv.c (+36, -0) (Diff)
/source/blender/bmesh/intern/bmesh_mesh_conv.h (+1, -0) (Diff)
/source/blender/bmesh/intern/bmesh_walkers.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_beautify.c (+2, -2) (Diff)
/source/blender/bmesh/operators/bmo_bridge.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_dupe.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_mirror.c (+1, -2) (Diff)
/source/blender/bmesh/operators/bmo_poke.c (+1, -1) (Diff)
/source/blender/bmesh/tools/bmesh_bevel.c (+2, -2) (Diff)
/source/blender/bmesh/tools/bmesh_decimate_collapse.c (+2, -2) (Diff)
/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c (+1, -1) (Diff)
/source/blender/collada/AnimationExporter.cpp (+1, -1) (Diff)
/source/blender/compositor/SConscript (+13, -2) (Diff)
/source/blender/editors/curve/curve_ops.c (+1, -0) (Diff)
/source/blender/editors/include/ED_screen.h (+2, -2) (Diff)
/source/blender/editors/include/ED_view3d.h (+0, -1) (Diff)
/source/blender/editors/include/UI_interface.h (+99, -94) (Diff)
/source/blender/editors/interface/interface_handlers.c (+6, -5) (Diff)
/source/blender/editors/interface/interface_intern.h (+3, -1) (Diff)
/source/blender/editors/interface/interface_layout.c (+20, -3) (Diff)
/source/blender/editors/interface/interface_regions.c (+3, -0) (Diff)
/source/blender/editors/interface/interface_style.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_templates.c (+136, -122) (Diff)
/source/blender/editors/interface/interface_widgets.c (+10, -15) (Diff)
/source/blender/editors/interface/resources.c (+13, -6) (Diff)
/source/blender/editors/mesh/editface.c (+12, -6) (Diff)
/source/blender/editors/mesh/editmesh_add.c (+1, -0) (Diff)
/source/blender/editors/mesh/editmesh_bevel.c (+2, -2) (Diff)
/source/blender/editors/mesh/editmesh_inset.c (+2, -2) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+1, -0) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+2, -0) (Diff)
/source/blender/editors/metaball/mball_ops.c (+2, -0) (Diff)
/source/blender/editors/object/object_add.c (+1, -1) (Diff)
/source/blender/editors/object/object_intern.h (+1, -1) (Diff)
/source/blender/editors/object/object_ops.c (+1, -1) (Diff)
/source/blender/editors/object/object_shapekey.c (+4, -3) (Diff)
/source/blender/editors/object/object_vgroup.c (+12, -12) (Diff)
/source/blender/editors/physics/physics_ops.c (+2, -0) (Diff)
/source/blender/editors/render/render_internal.c (+35, -8) (Diff)
/source/blender/editors/render/render_opengl.c (+8, -1) (Diff)
/source/blender/editors/screen/area.c (+4, -4) (Diff)
/source/blender/editors/sculpt_paint/paint_hide.c (+1, -3) (Diff)
/source/blender/editors/sculpt_paint/paint_image_proj.c (+43, -6) (Diff)
/source/blender/editors/sculpt_paint/paint_ops.c (+4, -2) (Diff)
/source/blender/editors/sculpt_paint/sculpt.c (+12, -2) (Diff)
/source/blender/editors/space_action/space_action.c (+4, -4) (Diff)
/source/blender/editors/space_api/spacetypes.c (+1, -0) (Diff)
/source/blender/editors/space_buttons/space_buttons.c (+3, -1) (Diff)
/source/blender/editors/space_clip/space_clip.c (+7, -7) (Diff)
/source/blender/editors/space_console/space_console.c (+1, -1) (Diff)
/source/blender/editors/space_file/filesel.c (+1, -1) (Diff)
/source/blender/editors/space_file/space_file.c (+4, -4) (Diff)
/source/blender/editors/space_graph/space_graph.c (+2, -2) (Diff)
/source/blender/editors/space_image/space_image.c (+9, -14) (Diff)
/source/blender/editors/space_info/space_info.c (+2, -2) (Diff)
/source/blender/editors/space_logic/logic_ops.c (+1, -0) (Diff)
/source/blender/editors/space_logic/space_logic.c (+1, -1) (Diff)
/source/blender/editors/space_nla/space_nla.c (+4, -4) (Diff)
/source/blender/editors/space_node/node_draw.c (+3, -3) (Diff)
/source/blender/editors/space_node/node_edit.c (+2, -2) (Diff)
/source/blender/editors/space_node/space_node.c (+2, -2) (Diff)
/source/blender/editors/space_outliner/space_outliner.c (+2, -2) (Diff)
/source/blender/editors/space_script/space_script.c (+1, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+2, -2) (Diff)
/source/blender/editors/space_sequencer/space_sequencer.c (+4, -4) (Diff)
/source/blender/editors/space_text/space_text.c (+1, -1) (Diff)
/source/blender/editors/space_text/text_ops.c (+3, -3) (Diff)
/source/blender/editors/space_time/space_time.c (+3, -3) (Diff)
/source/blender/editors/space_userpref/space_userpref.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+12, -3) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+22, -5) (Diff)
/source/blender/editors/space_view3d/view3d_buttons.c (+12, -4) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+0, -22) (Diff)
/source/blender/editors/space_view3d/view3d_fly.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_iterators.c (+1, -0) (Diff)
/source/blender/editors/transform/transform.h (+1, -0) (Diff)
/source/blender/editors/transform/transform_conversions.c (+15, -0) (Diff)
/source/blender/editors/transform/transform_generics.c (+0, -6) (Diff)
/source/blender/editors/transform/transform_manipulator.c (+5, -6) (Diff)
/source/blender/editors/transform/transform_ops.c (+1, -1) (Diff)
/source/blender/editors/util/undo.c (+1, -0) (Diff)
/source/blender/freestyle/intern/stroke/StrokeRep.cpp (+59, -25) (Diff)
/source/blender/freestyle/intern/view_map/SteerableViewMap.h (+1, -1) (Diff)
/source/blender/freestyle/SConscript (+9, -1) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+15, -4) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+89, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+3, -3) (Diff)
/source/blender/imbuf/intern/thumbs.c (+2, -2) (Diff)
/source/blender/imbuf/intern/util.c (+1, -1) (Diff)
/source/blender/makesdna/DNA_key_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_lattice_types.h (+0, -2) (Diff)
/source/blender/makesrna/intern/rna_key.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_lamp.c (+2, -4) (Diff)
/source/blender/makesrna/intern/rna_lattice.c (+36, -13) (Diff)
/source/blender/makesrna/intern/rna_material.c (+2, -11) (Diff)
/source/blender/modifiers/intern/MOD_multires.c (+6, -6) (Diff)
/source/blender/python/bmesh/bmesh_py_api.c (+6, -0) (Diff)
/source/blender/python/bmesh/bmesh_py_types.c (+3, -0) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+1, -0) (Diff)
/source/blender/render/intern/source/pipeline.c (+2, -1) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+27, -19) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+3, -0) (Diff)
/source/blender/windowmanager/WM_types.h (+1, -0) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+0, -1) (Diff)
/source/creator/creator.c (+0, -2) (Diff)
/source/gameengine/Ketsji/KX_Dome.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h (+1, -1) (Diff)
/intern/cycles/blender/addon/ui.py (+22, -2) (Diff)
/intern/cycles/blender/blender_session.cpp (+13, -7) (Diff)
/intern/cycles/device/device_opencl.cpp (+6, -0) (Diff)
/intern/cycles/render/session.cpp (+8, -4) (Diff)
/release/datafiles/startup.blend (+0, -0) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+2, -2) (Diff)
/source/blender/blenkernel/BKE_global.h (+1, -2) (Diff)
/source/blender/blenkernel/BKE_lattice.h (+3, -0) (Diff)
/source/blender/blenkernel/BKE_mesh.h (+14, -6) (Diff)
/source/blender/blenkernel/BKE_particle.h (+2, -0) (Diff)
/source/blender/blenkernel/BKE_screen.h (+2, -2) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+0, -1) (Diff)
/source/blender/blenkernel/intern/anim.c (+5, -2) (Diff)
/source/blender/blenkernel/intern/autoexec.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/bpath.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+4, -1) (Diff)
/source/blender/blenkernel/intern/deform.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/key.c (+27, -0) (Diff)
/source/blender/blenkernel/intern/lattice.c (+14, -1) (Diff)
/source/blender/blenkernel/intern/mball.c (+5, -3) (Diff)
/source/blender/blenkernel/intern/mesh.c (+74, -10) (Diff)
/source/blender/blenkernel/intern/node.c (+33, -27) (Diff)
/source/blender/blenkernel/intern/packedFile.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/particle.c (+16, -0) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+7, -7) (Diff)
/source/blender/blenkernel/intern/tracking.c (+1, -1) (Diff)
/source/blender/blenlib/BLI_scanfill.h (+0, -1) (Diff)
/source/blender/blenlib/intern/fileops.c (+1, -1) (Diff)
/source/blender/blenlib/intern/graph.c (+1, -1) (Diff)
/source/blender/blenlib/intern/math_color_inline.c (+1, -1) (Diff)
/source/blender/blenlib/intern/math_geom.c (+1, -1) (Diff)
/source/blender/blenlib/intern/scanfill.c (+1, -18) (Diff)
/source/blender/blenloader/intern/readfile.c (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_edgeloop.c (+2, -2) (Diff)
/source/blender/bmesh/intern/bmesh_iterators.h (+1, -1) (Diff)
/source/blender/bmesh/intern/bmesh_mesh_conv.c (+36, -0) (Diff)
/source/blender/bmesh/intern/bmesh_mesh_conv.h (+1, -0) (Diff)
/source/blender/bmesh/intern/bmesh_walkers.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_beautify.c (+2, -2) (Diff)
/source/blender/bmesh/operators/bmo_bridge.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_dupe.c (+1, -1) (Diff)
/source/blender/bmesh/operators/bmo_mirror.c (+1, -2) (Diff)
/source/blender/bmesh/operators/bmo_poke.c (+1, -1) (Diff)
/source/blender/bmesh/tools/bmesh_bevel.c (+2, -2) (Diff)
/source/blender/bmesh/tools/bmesh_decimate_collapse.c (+2, -2) (Diff)
/source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c (+1, -1) (Diff)
/source/blender/collada/AnimationExporter.cpp (+1, -1) (Diff)
/source/blender/compositor/SConscript (+13, -2) (Diff)
/source/blender/editors/curve/curve_ops.c (+1, -0) (Diff)
/source/blender/editors/include/ED_screen.h (+2, -2) (Diff)
/source/blender/editors/include/ED_view3d.h (+0, -1) (Diff)
/source/blender/editors/include/UI_interface.h (+99, -94) (Diff)
/source/blender/editors/interface/interface_handlers.c (+6, -5) (Diff)
/source/blender/editors/interface/interface_intern.h (+3, -1) (Diff)
/source/blender/editors/interface/interface_layout.c (+20, -3) (Diff)
/source/blender/editors/interface/interface_regions.c (+3, -0) (Diff)
/source/blender/editors/interface/interface_style.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_templates.c (+136, -122) (Diff)
/source/blender/editors/interface/interface_widgets.c (+10, -15) (Diff)
/source/blender/editors/interface/resources.c (+13, -6) (Diff)
/source/blender/editors/mesh/editface.c (+12, -6) (Diff)
/source/blender/editors/mesh/editmesh_add.c (+1, -0) (Diff)
/source/blender/editors/mesh/editmesh_bevel.c (+2, -2) (Diff)
/source/blender/editors/mesh/editmesh_inset.c (+2, -2) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+1, -0) (Diff)
/source/blender/editors/mesh/mesh_ops.c (+2, -0) (Diff)
/source/blender/editors/metaball/mball_ops.c (+2, -0) (Diff)
/source/blender/editors/object/object_add.c (+1, -1) (Diff)
/source/blender/editors/object/object_intern.h (+1, -1) (Diff)
/source/blender/editors/object/object_ops.c (+1, -1) (Diff)
/source/blender/editors/object/object_shapekey.c (+4, -3) (Diff)
/source/blender/editors/object/object_vgroup.c (+12, -12) (Diff)
/source/blender/editors/physics/physics_ops.c (+2, -0) (Diff)
/source/blender/editors/render/render_internal.c (+35, -8) (Diff)
/source/blender/editors/render/render_opengl.c (+8, -1) (Diff)
/source/blender/editors/screen/area.c (+4, -4) (Diff)
/source/blender/editors/sculpt_paint/paint_hide.c (+1, -3) (Diff)
/source/blender/editors/sculpt_paint/paint_image_proj.c (+43, -6) (Diff)
/source/blender/editors/sculpt_paint/paint_ops.c (+4, -2) (Diff)
/source/blender/editors/sculpt_paint/sculpt.c (+12, -2) (Diff)
/source/blender/editors/space_action/space_action.c (+4, -4) (Diff)
/source/blender/editors/space_api/spacetypes.c (+1, -0) (Diff)
/source/blender/editors/space_buttons/space_buttons.c (+3, -1) (Diff)
/source/blender/editors/space_clip/space_clip.c (+7, -7) (Diff)
/source/blender/editors/space_console/space_console.c (+1, -1) (Diff)
/source/blender/editors/space_file/filesel.c (+1, -1) (Diff)
/source/blender/editors/space_file/space_file.c (+4, -4) (Diff)
/source/blender/editors/space_graph/space_graph.c (+2, -2) (Diff)
/source/blender/editors/space_image/space_image.c (+9, -14) (Diff)
/source/blender/editors/space_info/space_info.c (+2, -2) (Diff)
/source/blender/editors/space_logic/logic_ops.c (+1, -0) (Diff)
/source/blender/editors/space_logic/space_logic.c (+1, -1) (Diff)
/source/blender/editors/space_nla/space_nla.c (+4, -4) (Diff)
/source/blender/editors/space_node/node_draw.c (+3, -3) (Diff)
/source/blender/editors/space_node/node_edit.c (+2, -2) (Diff)
/source/blender/editors/space_node/space_node.c (+2, -2) (Diff)
/source/blender/editors/space_outliner/space_outliner.c (+2, -2) (Diff)
/source/blender/editors/space_script/space_script.c (+1, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+2, -2) (Diff)
/source/blender/editors/space_sequencer/space_sequencer.c (+4, -4) (Diff)
/source/blender/editors/space_text/space_text.c (+1, -1) (Diff)
/source/blender/editors/space_text/text_ops.c (+3, -3) (Diff)
/source/blender/editors/space_time/space_time.c (+3, -3) (Diff)
/source/blender/editors/space_userpref/space_userpref.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+12, -3) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+22, -5) (Diff)
/source/blender/editors/space_view3d/view3d_buttons.c (+12, -4) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+0, -22) (Diff)
/source/blender/editors/space_view3d/view3d_fly.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_iterators.c (+1, -0) (Diff)
/source/blender/editors/transform/transform.h (+1, -0) (Diff)
/source/blender/editors/transform/transform_conversions.c (+15, -0) (Diff)
/source/blender/editors/transform/transform_generics.c (+0, -6) (Diff)
/source/blender/editors/transform/transform_manipulator.c (+5, -6) (Diff)
/source/blender/editors/transform/transform_ops.c (+1, -1) (Diff)
/source/blender/editors/util/undo.c (+1, -0) (Diff)
/source/blender/freestyle/intern/stroke/StrokeRep.cpp (+59, -25) (Diff)
/source/blender/freestyle/intern/view_map/SteerableViewMap.h (+1, -1) (Diff)
/source/blender/freestyle/SConscript (+9, -1) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+15, -4) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+89, -1) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+3, -3) (Diff)
/source/blender/imbuf/intern/thumbs.c (+2, -2) (Diff)
/source/blender/imbuf/intern/util.c (+1, -1) (Diff)
/source/blender/makesdna/DNA_key_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_lattice_types.h (+0, -2) (Diff)
/source/blender/makesrna/intern/rna_key.c (+1, -0) (Diff)
/source/blender/makesrna/intern/rna_lamp.c (+2, -4) (Diff)
/source/blender/makesrna/intern/rna_lattice.c (+36, -13) (Diff)
/source/blender/makesrna/intern/rna_material.c (+2, -11) (Diff)
/source/blender/modifiers/intern/MOD_multires.c (+6, -6) (Diff)
/source/blender/python/bmesh/bmesh_py_api.c (+6, -0) (Diff)
/source/blender/python/bmesh/bmesh_py_types.c (+3, -0) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+1, -0) (Diff)
/source/blender/render/intern/source/pipeline.c (+2, -1) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+27, -19) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+3, -0) (Diff)
/source/blender/windowmanager/WM_types.h (+1, -0) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+0, -1) (Diff)
/source/creator/creator.c (+0, -2) (Diff)
/source/gameengine/Ketsji/KX_Dome.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h (+1, -1) (Diff)