Blender Git Loki
Git Commits -> Revision c2147a9
Revision c2147a9 by Joerg Mueller (master) May 1, 2010, 16:18 (GMT) |
Merge with trunk, revision 28446 - 28528. |
Commit Details:
Full Hash: c2147a9c3d502caea6a54749cd46d2d79c67caa0
SVN Revision: 28529
Parent Commit: 8d5e5e6
Lines Changed: +9013, -9260
2 Added Paths:
/source/blender/editors/include/ED_logic.h (+36, -0) (View)
/source/blender/editors/space_logic/logic_ops.c (+196, -0) (View)
/source/blender/editors/space_logic/logic_ops.c (+196, -0) (View)
82 Modified Paths:
/intern/guardedalloc/intern/mallocn.c (+22, -15) (Diff)
/intern/guardedalloc/MEM_guardedalloc.h (+5, -5) (Diff)
/projectfiles_vc9/blender/editors/ED_editors.vcproj (+8, -0) (Diff)
/release/scripts/io/netrender/client.py (+7, -0) (Diff)
/release/scripts/io/netrender/master.py (+17, -7) (Diff)
/release/scripts/io/netrender/master_html.py (+55, -52) (Diff)
/release/scripts/io/netrender/model.py (+7, -4) (Diff)
/release/scripts/io/netrender/netrender.css (+4, -0) (Diff)
/release/scripts/io/netrender/slave.py (+36, -14) (Diff)
/release/scripts/io/netrender/ui.py (+20, -11) (Diff)
/release/scripts/io/netrender/utils.py (+13, -1) (Diff)
/release/scripts/modules/graphviz_export.py (+12, -11) (Diff)
/release/scripts/op/uvcalc_smart_project.py (+1, -1) (Diff)
/release/scripts/templates/operator_modal_draw.py (+5, -3) (Diff)
/release/scripts/ui/space_userpref.py (+1, -0) (Diff)
/release/scripts/ui/space_view3d.py (+17, -14) (Diff)
/source/blender/blenkernel/BKE_constraint.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/action.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/armature.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/blender.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/brush.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/constraint.c (+8, -5) (Diff)
/source/blender/blenkernel/intern/ipo.c (+60, -31) (Diff)
/source/blender/blenkernel/intern/library.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/node.c (+2, -1) (Diff)
/source/blender/blenkernel/intern/object.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/pointcache.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/smoke.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/texture.c (+1, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+22, -12) (Diff)
/source/blender/editors/animation/anim_channels_defines.c (+2, -2) (Diff)
/source/blender/editors/armature/poseobject.c (+2, -2) (Diff)
/source/blender/editors/curve/editcurve.c (+106, -38) (Diff)
/source/blender/editors/datafiles/B.blend.c (+7754, -8744) (Diff)
/source/blender/editors/gpencil/drawgpencil.c (+4, -4) (Diff)
/source/blender/editors/include/ED_gpencil.h (+3, -3) (Diff)
/source/blender/editors/include/ED_physics.h (+1, -1) (Diff)
/source/blender/editors/include/UI_resources.h (+1, -0) (Diff)
/source/blender/editors/interface/interface_handlers.c (+6, -0) (Diff)
/source/blender/editors/interface/interface_templates.c (+28, -0) (Diff)
/source/blender/editors/interface/resources.c (+11, -0) (Diff)
/source/blender/editors/object/object_constraint.c (+1, -1) (Diff)
/source/blender/editors/object/object_edit.c (+1, -1) (Diff)
/source/blender/editors/object/object_select.c (+24, -3) (Diff)
/source/blender/editors/physics/particle_edit.c (+26, -16) (Diff)
/source/blender/editors/physics/physics_intern.h (+2, -2) (Diff)
/source/blender/editors/physics/physics_ops.c (+2, -2) (Diff)
/source/blender/editors/space_api/spacetypes.c (+2, -0) (Diff)
/source/blender/editors/space_file/filelist.c (+2, -4) (Diff)
/source/blender/editors/space_file/space_file.c (+13, -2) (Diff)
/source/blender/editors/space_image/image_draw.c (+1, -1) (Diff)
/source/blender/editors/space_logic/logic_intern.h (+1, -0) (Diff)
/source/blender/editors/space_logic/logic_window.c (+115, -2) (Diff)
/source/blender/editors/space_nla/nla_draw.c (+2, -2) (Diff)
/source/blender/editors/space_node/node_draw.c (+2, -2) (Diff)
/source/blender/editors/space_node/node_select.c (+4, -7) (Diff)
/source/blender/editors/space_node/space_node.c (+2, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+26, -8) (Diff)
/source/blender/editors/space_view3d/drawvolume.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+6, -5) (Diff)
/source/blender/editors/space_view3d/view3d_header.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_select.c (+38, -16) (Diff)
/source/blender/makesdna/DNA_curve_types.h (+2, -2) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_fcurve.c (+9, -1) (Diff)
/source/blender/makesrna/intern/rna_object.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_sensor.c (+35, -20) (Diff)
/source/blender/makesrna/intern/rna_space.c (+49, -19) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+6, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+1, -1) (Diff)
/source/blender/makesrna/RNA_enum_types.h (+2, -0) (Diff)
/source/blender/python/generic/mathutils.c (+4, -4) (Diff)
/source/blender/python/generic/mathutils.h (+4, -4) (Diff)
/source/blender/python/generic/mathutils_Matrix.c (+16, -16) (Diff)
/source/blender/python/intern/bpy_rna.c (+53, -43) (Diff)
/source/blender/windowmanager/intern/wm_files.c (+2, -2) (Diff)
/source/creator/creator.c (+12, -22) (Diff)
/source/gameengine/Converter/BL_ArmatureObject.cpp (+1, -1) (Diff)
/source/gameengine/Ketsji/KX_GameObject.cpp (+35, -35) (Diff)
/source/gameengine/Ketsji/KX_ObjectActuator.cpp (+14, -14) (Diff)
/intern/guardedalloc/MEM_guardedalloc.h (+5, -5) (Diff)
/projectfiles_vc9/blender/editors/ED_editors.vcproj (+8, -0) (Diff)
/release/scripts/io/netrender/client.py (+7, -0) (Diff)
/release/scripts/io/netrender/master.py (+17, -7) (Diff)
/release/scripts/io/netrender/master_html.py (+55, -52) (Diff)
/release/scripts/io/netrender/model.py (+7, -4) (Diff)
/release/scripts/io/netrender/netrender.css (+4, -0) (Diff)
/release/scripts/io/netrender/slave.py (+36, -14) (Diff)
/release/scripts/io/netrender/ui.py (+20, -11) (Diff)
/release/scripts/io/netrender/utils.py (+13, -1) (Diff)
/release/scripts/modules/graphviz_export.py (+12, -11) (Diff)
/release/scripts/op/uvcalc_smart_project.py (+1, -1) (Diff)
/release/scripts/templates/operator_modal_draw.py (+5, -3) (Diff)
/release/scripts/ui/space_userpref.py (+1, -0) (Diff)
/release/scripts/ui/space_view3d.py (+17, -14) (Diff)
/source/blender/blenkernel/BKE_constraint.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/action.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/armature.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/blender.c (+2, -0) (Diff)
/source/blender/blenkernel/intern/brush.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/constraint.c (+8, -5) (Diff)
/source/blender/blenkernel/intern/ipo.c (+60, -31) (Diff)
/source/blender/blenkernel/intern/library.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/node.c (+2, -1) (Diff)
/source/blender/blenkernel/intern/object.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/pointcache.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+3, -3) (Diff)
/source/blender/blenkernel/intern/smoke.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/texture.c (+1, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+22, -12) (Diff)
/source/blender/editors/animation/anim_channels_defines.c (+2, -2) (Diff)
/source/blender/editors/armature/poseobject.c (+2, -2) (Diff)
/source/blender/editors/curve/editcurve.c (+106, -38) (Diff)
/source/blender/editors/datafiles/B.blend.c (+7754, -8744) (Diff)
/source/blender/editors/gpencil/drawgpencil.c (+4, -4) (Diff)
/source/blender/editors/include/ED_gpencil.h (+3, -3) (Diff)
/source/blender/editors/include/ED_physics.h (+1, -1) (Diff)
/source/blender/editors/include/UI_resources.h (+1, -0) (Diff)
/source/blender/editors/interface/interface_handlers.c (+6, -0) (Diff)
/source/blender/editors/interface/interface_templates.c (+28, -0) (Diff)
/source/blender/editors/interface/resources.c (+11, -0) (Diff)
/source/blender/editors/object/object_constraint.c (+1, -1) (Diff)
/source/blender/editors/object/object_edit.c (+1, -1) (Diff)
/source/blender/editors/object/object_select.c (+24, -3) (Diff)
/source/blender/editors/physics/particle_edit.c (+26, -16) (Diff)
/source/blender/editors/physics/physics_intern.h (+2, -2) (Diff)
/source/blender/editors/physics/physics_ops.c (+2, -2) (Diff)
/source/blender/editors/space_api/spacetypes.c (+2, -0) (Diff)
/source/blender/editors/space_file/filelist.c (+2, -4) (Diff)
/source/blender/editors/space_file/space_file.c (+13, -2) (Diff)
/source/blender/editors/space_image/image_draw.c (+1, -1) (Diff)
/source/blender/editors/space_logic/logic_intern.h (+1, -0) (Diff)
/source/blender/editors/space_logic/logic_window.c (+115, -2) (Diff)
/source/blender/editors/space_nla/nla_draw.c (+2, -2) (Diff)
/source/blender/editors/space_node/node_draw.c (+2, -2) (Diff)
/source/blender/editors/space_node/node_select.c (+4, -7) (Diff)
/source/blender/editors/space_node/space_node.c (+2, -1) (Diff)
/source/blender/editors/space_sequencer/sequencer_draw.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+26, -8) (Diff)
/source/blender/editors/space_view3d/drawvolume.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+6, -5) (Diff)
/source/blender/editors/space_view3d/view3d_header.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_select.c (+38, -16) (Diff)
/source/blender/makesdna/DNA_curve_types.h (+2, -2) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_fcurve.c (+9, -1) (Diff)
/source/blender/makesrna/intern/rna_object.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_sensor.c (+35, -20) (Diff)
/source/blender/makesrna/intern/rna_space.c (+49, -19) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+6, -0) (Diff)
/source/blender/makesrna/RNA_access.h (+1, -1) (Diff)
/source/blender/makesrna/RNA_enum_types.h (+2, -0) (Diff)
/source/blender/python/generic/mathutils.c (+4, -4) (Diff)
/source/blender/python/generic/mathutils.h (+4, -4) (Diff)
/source/blender/python/generic/mathutils_Matrix.c (+16, -16) (Diff)
/source/blender/python/intern/bpy_rna.c (+53, -43) (Diff)
/source/blender/windowmanager/intern/wm_files.c (+2, -2) (Diff)
/source/creator/creator.c (+12, -22) (Diff)
/source/gameengine/Converter/BL_ArmatureObject.cpp (+1, -1) (Diff)
/source/gameengine/Ketsji/KX_GameObject.cpp (+35, -35) (Diff)
/source/gameengine/Ketsji/KX_ObjectActuator.cpp (+14, -14) (Diff)