[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28666] branches/soc-2010-nicolasbishop: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28447 :28663
Nicholas Bishop
nicholasbishop at gmail.com
Sat May 8 10:54:26 CEST 2010
Revision: 28666
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28666
Author: nicholasbishop
Date: 2010-05-08 10:54:22 +0200 (Sat, 08 May 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28447:28663
Modified Paths:
--------------
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_DropTargetWin32.cpp
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2010-nicolasbishop/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2010-nicolasbishop/intern/guardedalloc/intern/mallocn.c
branches/soc-2010-nicolasbishop/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2010-nicolasbishop/release/datafiles/blenderbuttons
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/client.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/master.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/master_html.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/model.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/netrender.css
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/operators.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/slave.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/ui.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/utils.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpy_types.py
branches/soc-2010-nicolasbishop/release/scripts/modules/graphviz_export.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/arm_biped.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/eye_balls.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/eye_lid.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/finger_curl.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/leg_biped.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/leg_quadruped.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/mouth.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/neck.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/neck_flex.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/palm_curl.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/shape_key_control.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/shape_key_distance.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/shape_key_rotdiff.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/spine_pivot_flex.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/tail_control.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/tongue.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify_utils.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rna_info.py
branches/soc-2010-nicolasbishop/release/scripts/op/console_python.py
branches/soc-2010-nicolasbishop/release/scripts/op/image.py
branches/soc-2010-nicolasbishop/release/scripts/op/sequencer.py
branches/soc-2010-nicolasbishop/release/scripts/op/uvcalc_smart_project.py
branches/soc-2010-nicolasbishop/release/scripts/op/vertexpaint_dirt.py
branches/soc-2010-nicolasbishop/release/scripts/templates/operator_modal_draw.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_mesh.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_material.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_object.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_particle.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_common.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_render.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_texture.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_image.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_info.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_outliner.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_sequencer.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_time.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref_keymap.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d.py
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_constraint.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_image.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/BME_tools.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/action.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/armature.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/blender.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/bmfont.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/brush.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/colortools.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/constraint.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/customdata.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/group.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/icons.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/image.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/ipo.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/library.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/nla.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/node.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/object.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/particle.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/pointcache.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/sca.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/smoke.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/softbody.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/texture.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/writeavi.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_ghash.h
branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_math_vector.h
branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_path_util.h
branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_storage.h
branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_string.h
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/BLI_args.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/BLI_dynstr.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/bpath.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/path_util.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/pbvh.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/storage.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/string.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/BLO_readfile.h
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readblenentry.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readfile.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/writefile.c
branches/soc-2010-nicolasbishop/source/blender/blenpluginapi/iff.h
branches/soc-2010-nicolasbishop/source/blender/blenpluginapi/intern/pluginapi.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_markers.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/keyframing.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/editarmature.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/poseobject.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/reeb.c
branches/soc-2010-nicolasbishop/source/blender/editors/curve/editcurve.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/B.blend.c
branches/soc-2010-nicolasbishop/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_gpencil.h
branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_physics.h
branches/soc-2010-nicolasbishop/source/blender/editors/include/UI_icons.h
branches/soc-2010-nicolasbishop/source/blender/editors/include/UI_resources.h
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_icons.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_templates.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/resources.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/view2d.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/view2d_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/meshtools.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_add.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_constraint.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_group.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_modifier.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_relations.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_select.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_vgroup.c
branches/soc-2010-nicolasbishop/source/blender/editors/physics/particle_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/physics/physics_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/physics/physics_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/render/render_internal.c
branches/soc-2010-nicolasbishop/source/blender/editors/render/render_shading.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/screendump.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_api/spacetypes.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_console/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/space_console/space_console.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/file_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/file_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/file_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/filelist.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/filesel.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/space_file.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/writeimage.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_buttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/space_image.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/logic_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/space_logic.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_nla/nla_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_nla/nla_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/node_select.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/space_node.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform.h
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_constraints.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_generics.c
branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_draw.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/imbuf/IMB_imbuf.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/IMB_thumbs.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/SConscript
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_anim.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_filter.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/anim.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/bmp.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/dds/dds_api.cpp
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/dds/dds_api.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/divers.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/dynlibtiff.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/dynlibtiff.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/filter.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/imageprocess.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/imbuf.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/imbuf_cocoa.m
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/iris.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/jp2.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/jpeg.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/openexr/openexr_api.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/png.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/radiance_hdr.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/readimage.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/rectop.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/rotate.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/scaling.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/targa.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/thumbs.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/tiff.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/util.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/writeimage.c
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_action_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_controller_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_curve_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_image_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_object_force.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_object_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_scene_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_sensor_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_space_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2010-nicolasbishop/source/blender/makesrna/RNA_access.h
branches/soc-2010-nicolasbishop/source/blender/makesrna/RNA_enum_types.h
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_access.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_action.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_animation.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_animviz.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_armature.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_boid.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_color.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_controller.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_image.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_internal.h
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_main.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_material.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_meta.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_particle.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_pose.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_property.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_rna.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_space.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_texture.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_build.c
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2010-nicolasbishop/source/blender/python/doc/sphinx_doc_gen.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/sphinx_doc_gen.sh
branches/soc-2010-nicolasbishop/source/blender/python/generic/blf_api.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils.h
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils_matrix.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_rna.c
branches/soc-2010-nicolasbishop/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2010-nicolasbishop/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2010-nicolasbishop/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/convertblender.c
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/pipeline.c
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/sss.c
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/strand.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_window.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/wm_event_types.h
branches/soc-2010-nicolasbishop/source/blenderplayer/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2010-nicolasbishop/source/creator/creator.c
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_PythonInit.h
Added Paths:
-----------
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/repath.py
branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_logic.h
branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/logic_ops.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_filetype.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_metadata.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/cache.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/filetype.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/metadata.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/module.c
Removed Paths:
-------------
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_amiga.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_anim5.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_bitplanes.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_bmp.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_cmap.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_cocoa.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_divers.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_dpxcineon.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_ham.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_hamx.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_iff.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_imginfo.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_iris.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_jp2.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_jpeg.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_png.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_radiance_hdr.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_targa.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/IMB_tiff.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/amiga.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/anim5.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/antialias.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/bitplanes.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/cmap.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/cspace.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/data.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/dither.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/gen_dynlibtiff.py
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/ham.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/hamx.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/iff.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/imbuf_patch.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/imginfo.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/matrix.h
Modified: branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_DropTargetWin32.cpp
===================================================================
--- branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_DropTargetWin32.cpp 2010-05-08 08:45:16 UTC (rev 28665)
+++ branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_DropTargetWin32.cpp 2010-05-08 08:54:22 UTC (rev 28666)
@@ -110,8 +110,8 @@
*/
HRESULT __stdcall GHOST_DropTargetWin32::DragEnter(IDataObject * pDataObject, DWORD grfKeyState, POINTL pt, DWORD * pdwEffect)
{
- // we don't know yet if we accept the drop.
- m_window->setAcceptDragOperation(false);
+ // we accept all drop by default
+ m_window->setAcceptDragOperation(true);
*pdwEffect = DROPEFFECT_NONE;
m_draggedObjectType = getGhostType(pDataObject);
Modified: branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowCocoa.mm 2010-05-08 08:45:16 UTC (rev 28665)
+++ branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowCocoa.mm 2010-05-08 08:54:22 UTC (rev 28666)
@@ -167,7 +167,7 @@
else if ([[draggingPBoard types] containsObject:NSStringPboardType]) m_draggedObjectType = GHOST_kDragnDropTypeString;
else return NSDragOperationNone;
- associatedWindow->setAcceptDragOperation(FALSE); //Drag operation needs to be accepted explicitly by the event manager
+ associatedWindow->setAcceptDragOperation(TRUE); //Drag operation is accepted by default
systemCocoa->handleDraggingEvent(GHOST_kEventDraggingEntered, m_draggedObjectType, associatedWindow, mouseLocation.x, mouseLocation.y, nil);
return NSDragOperationCopy;
}
Modified: branches/soc-2010-nicolasbishop/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- branches/soc-2010-nicolasbishop/intern/guardedalloc/MEM_guardedalloc.h 2010-05-08 08:45:16 UTC (rev 28665)
+++ branches/soc-2010-nicolasbishop/intern/guardedalloc/MEM_guardedalloc.h 2010-05-08 08:54:22 UTC (rev 28666)
@@ -66,7 +66,7 @@
/** Returns the lenght of the allocated memory segment pointed at
* by vmemh. If the pointer was not previously allocated by this
* module, the result is undefined.*/
- int MEM_allocN_len(void *vmemh);
+ size_t MEM_allocN_len(void *vmemh);
/**
* Release memory previously allocatred by this module.
@@ -89,23 +89,23 @@
* allocated block, the old one is freed. this is not as optimized
* as a system realloc but just makes a new allocation and copies
* over from existing memory. */
- void *MEM_reallocN(void *vmemh, unsigned int len);
+ void *MEM_reallocN(void *vmemh, size_t len);
/**
* Allocate a block of memory of size len, with tag name str. The
* memory is cleared. The name must be static, because only a
* pointer to it is stored ! */
- void *MEM_callocN(unsigned int len, const char * str);
+ void *MEM_callocN(size_t len, const char * str);
/** Allocate a block of memory of size len, with tag name str. The
* name must be a static, because only a pointer to it is stored !
* */
- void *MEM_mallocN(unsigned int len, const char * str);
+ void *MEM_mallocN(size_t len, const char * str);
/** Same as callocN, clears memory and uses mmap (disk cached) if supported.
Can be free'd with MEM_freeN as usual.
* */
- void *MEM_mapallocN(unsigned int len, const char * str);
+ void *MEM_mapallocN(size_t len, const char * str);
/** Print a list of the names and sizes of all allocated memory
* blocks. as a python dict for easy investigation */
@@ -144,6 +144,12 @@
uintptr_t MEM_get_mapped_memory_in_use(void);
int MEM_get_memory_blocks_in_use(void);
+ /*reset the peak memory statistic to zero*/
+ void MEM_reset_peak_memory(void);
+
+ /*get the peak memory usage in bytes, including mmap allocations*/
+ uintptr_t MEM_get_peak_memory(void);
+
#ifdef __cplusplus
}
#endif
Modified: branches/soc-2010-nicolasbishop/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2010-nicolasbishop/intern/guardedalloc/intern/mallocn.c 2010-05-08 08:45:16 UTC (rev 28665)
+++ branches/soc-2010-nicolasbishop/intern/guardedalloc/intern/mallocn.c 2010-05-08 08:54:22 UTC (rev 28666)
@@ -36,13 +36,20 @@
#include <stdlib.h>
#include <string.h> /* memcpy */
#include <stdarg.h>
+#include <sys/types.h>
+/* Blame Microsoft for LLP64 and no inttypes.h, quick workaround needed: */
+#if defined(WIN64)
+#define SIZET_FORMAT "%I64u"
+#define SIZET_ARG(a) ((unsigned long long)(a))
+#else
+#define SIZET_FORMAT "%lu"
+#define SIZET_ARG(a) ((unsigned long)(a))
+#endif
/* mmap exception */
#if defined(WIN32)
-#include <sys/types.h>
#include "mmap_win.h"
#else
-#include <sys/types.h>
#include <sys/mman.h>
#endif
@@ -82,7 +89,7 @@
/* note: keep this struct aligned (e.g., irix/gcc) - Hos */
typedef struct MemHead {
int tag1;
- int len;
+ size_t len;
struct MemHead *next,*prev;
const char * name;
const char * nextname;
@@ -131,7 +138,7 @@
static volatile int totblock= 0;
-static volatile uintptr_t mem_in_use= 0, mmap_in_use= 0;
+static volatile uintptr_t mem_in_use= 0, mmap_in_use= 0, peak_mem = 0;
static volatile struct localListBase _membase;
static volatile struct localListBase *membase = &_membase;
@@ -213,7 +220,7 @@
malloc_debug_memset= 1;
}
-int MEM_allocN_len(void *vmemh)
+size_t MEM_allocN_len(void *vmemh)
{
if (vmemh) {
MemHead *memh= vmemh;
@@ -245,7 +252,7 @@
return newp;
}
-void *MEM_reallocN(void *vmemh, unsigned int len)
+void *MEM_reallocN(void *vmemh, size_t len)
{
void *newp= NULL;
@@ -267,7 +274,7 @@
return newp;
}
-static void make_memhead_header(MemHead *memh, unsigned int len, const char *str)
+static void make_memhead_header(MemHead *memh, size_t len, const char *str)
{
MemTail *memt;
@@ -286,9 +293,11 @@
totblock++;
mem_in_use += len;
+
+ peak_mem = mem_in_use > peak_mem ? mem_in_use : peak_mem;
}
-void *MEM_mallocN(unsigned int len, const char *str)
+void *MEM_mallocN(size_t len, const char *str)
{
MemHead *memh;
@@ -312,11 +321,11 @@
return (++memh);
}
mem_unlock_thread();
- print_error("Malloc returns nill: len=%d in %s, total %u\n",len, str, mem_in_use);
+ print_error("Malloc returns null: len=" SIZET_FORMAT " in %s, total %u\n", SIZET_ARG(len), str, mem_in_use);
return NULL;
}
-void *MEM_callocN(unsigned int len, const char *str)
+void *MEM_callocN(size_t len, const char *str)
{
MemHead *memh;
@@ -337,12 +346,12 @@
return (++memh);
}
mem_unlock_thread();
- print_error("Calloc returns nill: len=%d in %s, total %u\n",len, str, mem_in_use);
+ print_error("Calloc returns null: len=" SIZET_FORMAT " in %s, total %u\n", SIZET_ARG(len), str, mem_in_use);
return 0;
}
/* note; mmap returns zero'd memory */
-void *MEM_mapallocN(unsigned int len, const char *str)
+void *MEM_mapallocN(size_t len, const char *str)
{
MemHead *memh;
@@ -370,6 +379,7 @@
make_memhead_header(memh, len, str);
memh->mmap= 1;
mmap_in_use += len;
+ peak_mem = mmap_in_use > peak_mem ? mmap_in_use : peak_mem;
mem_unlock_thread();
#ifdef DEBUG_MEMCOUNTER
if(_mallocn_count==DEBUG_MEMCOUNTER_ERROR_VAL)
@@ -380,7 +390,7 @@
}
else {
mem_unlock_thread();
- print_error("Mapalloc returns nill, fallback to regular malloc: len=%d in %s, total %u\n",len, str, mmap_in_use);
+ print_error("Mapalloc returns null, fallback to regular malloc: len=" SIZET_FORMAT " in %s, total %u\n", SIZET_ARG(len), str, mmap_in_use);
return MEM_callocN(len, str);
}
}
@@ -492,12 +502,12 @@
}
while(membl) {
if (pydict) {
- fprintf(stderr, "{'len':%i, 'name':'''%s''', 'pointer':'%p'},\\\n", membl->len, membl->name, membl+1);
+ fprintf(stderr, "{'len':" SIZET_FORMAT ", 'name':'''%s''', 'pointer':'%p'},\\\n", SIZET_ARG(membl->len), membl->name, membl+1);
} else {
#ifdef DEBUG_MEMCOUNTER
- print_error("%s len: %d %p, count: %d\n",membl->name,membl->len, membl+1, membl->_count);
+ print_error("%s len: " SIZET_FORMAT " %p, count: %d\n", membl->name, SIZET_ARG(membl->len), membl+1, membl->_count);
#else
- print_error("%s len: %d %p\n",membl->name,membl->len, membl+1);
+ print_error("%s len: " SIZET_FORMAT " %p\n", membl->name, SIZET_ARG(membl->len), membl+1);
#endif
}
if(membl->next)
@@ -795,6 +805,24 @@
return(name);
}
+uintptr_t MEM_get_peak_memory(void)
+{
+ uintptr_t _peak_mem;
+
+ mem_lock_thread();
+ _peak_mem = peak_mem;
+ mem_unlock_thread();
+
+ return _peak_mem;
+}
+
+void MEM_reset_peak_memory(void)
+{
+ mem_lock_thread();
+ peak_mem = 0;
+ mem_unlock_thread();
+}
+
uintptr_t MEM_get_memory_in_use(void)
{
uintptr_t _mem_in_use;
Modified: branches/soc-2010-nicolasbishop/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
--- branches/soc-2010-nicolasbishop/projectfiles_vc9/blender/editors/ED_editors.vcproj 2010-05-08 08:45:16 UTC (rev 28665)
+++ branches/soc-2010-nicolasbishop/projectfiles_vc9/blender/editors/ED_editors.vcproj 2010-05-08 08:54:22 UTC (rev 28666)
@@ -235,6 +235,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\editors\include\ED_logic.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\include\ED_markers.h"
>
</File>
@@ -1476,6 +1480,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\editors\space_logic\logic_ops.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\space_logic\logic_window.c"
>
</File>
Modified: branches/soc-2010-nicolasbishop/release/datafiles/blenderbuttons
===================================================================
(Binary files differ)
Modified: branches/soc-2010-nicolasbishop/release/scripts/io/netrender/__init__.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/netrender/__init__.py 2010-05-08 08:45:16 UTC (rev 28665)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/netrender/__init__.py 2010-05-08 08:54:22 UTC (rev 28666)
@@ -27,6 +27,7 @@
from netrender import utils
from netrender import balancing
from netrender import ui
+from netrender import repath
jobs = []
slaves = []
Modified: branches/soc-2010-nicolasbishop/release/scripts/io/netrender/client.py
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list