Revision: 36302
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36302
Author: kjym3
Date: 2011-04-23 22:08:18 +0000 (Sat, 23 Apr 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 36301.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36301
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mmap_win.c
branches/soc-2008-mxcurioni/intern/guardedalloc/test/simpletest/memtest.c
branches/soc-2008-mxcurioni/release/datafiles/brushicons/add.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/blob.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/blur.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/clay.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/clone.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/crease.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/darken.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/draw.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/fill.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/flatten.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/grab.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/inflate.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/layer.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/lighten.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/mix.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/multiply.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/nudge.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/pinch.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/scrape.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/smear.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/smooth.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/snake_hook.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/soften.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/subtract.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/texdraw.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/thumb.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/twist.png
branches/soc-2008-mxcurioni/release/datafiles/brushicons/vertexdraw.png
branches/soc-2008-mxcurioni/release/plugins/sequence/blur.c
branches/soc-2008-mxcurioni/release/plugins/sequence/color-correction-hsv.c
branches/soc-2008-mxcurioni/release/plugins/sequence/color-correction-yuv.c
branches/soc-2008-mxcurioni/release/plugins/sequence/dnr.c
branches/soc-2008-mxcurioni/release/plugins/sequence/gamma.c
branches/soc-2008-mxcurioni/release/plugins/sequence/scatter.c
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/animsys_update.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/presets.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/release/scripts/startup/keyingsets_builtins.py
branches/soc-2008-mxcurioni/release/windows/contrib/vfapi/vfapi-plugin.c
branches/soc-2008-mxcurioni/source/blender/avi/intern/avi.c
branches/soc-2008-mxcurioni/source/blender/avi/intern/codecs.c
branches/soc-2008-mxcurioni/source/blender/avi/intern/options.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sketch.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_text.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/colortools.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/deform.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/exotic.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idprop.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image_gen.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lattice.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/report.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sca.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sketch.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/unit.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeavi.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/boxpack2d.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fileops.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom_inline.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/noise.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/pbvh.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/winstuff.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_general.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/armature_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/meshlaplacian.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poseSlide.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/reeb.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editfont.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_armature.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_curve.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mball.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_particle.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_panel.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_group.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_lattice.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/space_action.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/space_console.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/space_nla.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_state.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/space_node.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.h
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_constraints.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_input.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.c
branches/soc-2008-mxcurioni/source/blender/editors/util/crazyspace.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-mxcurioni/source/blender/imbuf/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim_movie.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jpeg.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/scaling.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/thumbs.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/tiff.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_action.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_brush.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_controller.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nla.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_array.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_build.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_crop.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_lensdist.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_mapValue.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_util.c
branches/soc-2008-mxcurioni/source/blender/python/generic/IDProp.c
branches/soc-2008-mxcurioni/source/blender/python/generic/bgl.c
branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_geometry.c
branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.c
branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_driver.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_traceback.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_util.c
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/imagetexture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pixelblending.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pixelshading.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_texture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadbuf.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeinput.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/strand.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/sunsky.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/volume_precache.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/voxeldata.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/zbuf.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_event_system.h
branches/soc-2008-mxcurioni/source/blenderplayer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/UnixShell.c
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/npunix.c
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
Added Paths:
-----------
branches/soc-2008-mxcurioni/release/freedesktop/icons/16x16/apps/
branches/soc-2008-mxcurioni/release/freedesktop/icons/16x16/apps/blender.png
branches/soc-2008-mxcurioni/release/freedesktop/icons/22x22/apps/
branches/soc-2008-mxcurioni/release/freedesktop/icons/22x22/apps/blender.png
branches/soc-2008-mxcurioni/release/freedesktop/icons/24x24/
branches/soc-2008-mxcurioni/release/freedesktop/icons/24x24/apps/
branches/soc-2008-mxcurioni/release/freedesktop/icons/24x24/apps/blender.png
branches/soc-2008-mxcurioni/release/freedesktop/icons/256x256/
branches/soc-2008-mxcurioni/release/freedesktop/icons/256x256/apps/
branches/soc-2008-mxcurioni/release/freedesktop/icons/256x256/apps/blender.png
branches/soc-2008-mxcurioni/release/freedesktop/icons/32x32/apps/
branches/soc-2008-mxcurioni/release/freedesktop/icons/32x32/apps/blender.png
branches/soc-2008-mxcurioni/release/freedesktop/icons/48x48/apps/
branches/soc-2008-mxcurioni/release/freedesktop/icons/48x48/apps/blender.png
branches/soc-2008-mxcurioni/release/freedesktop/icons/blender_icon_source.svg
branches/soc-2008-mxcurioni/release/freedesktop/icons/scalable/apps/
branches/soc-2008-mxcurioni/release/freedesktop/icons/scalable/apps/blender.svg
Removed Paths:
-------------
branches/soc-2008-mxcurioni/release/freedesktop/icons/128x128/
branches/soc-2008-mxcurioni/release/freedesktop/icons/16x16/apps/blender.png
branches/soc-2008-mxcurioni/release/freedesktop/icons/16x16/blender.png
branches/soc-2008-mxcurioni/release/freedesktop/icons/16x16/blender.svg
branches/soc-2008-mxcurioni/release/freedesktop/icons/192x192/
branches/soc-2008-mxcurioni/release/freedesktop/icons/22x22/apps/blender.png
branches/soc-2008-mxcurioni/release/freedesktop/icons/22x22/blender.png
branches/soc-2008-mxcurioni/release/freedesktop/icons/22x22/blender.svg
branches/soc-2008-mxcurioni/release/freedesktop/icons/24x24/apps/
branches/soc-2008-mxcurioni/release/freedesktop/icons/24x24/apps/blender.png
branches/soc-2008-mxcurioni/release/freedesktop/icons/256x256/apps/
branches/soc-2008-mxcurioni/release/freedesktop/icons/256x256/apps/blender.png
branches/soc-2008-mxcurioni/release/freedesktop/icons/32x32/apps/blender.png
branches/soc-2008-mxcurioni/release/freedesktop/icons/32x32/blender.png
branches/soc-2008-mxcurioni/release/freedesktop/icons/32x32/blender.svg
branches/soc-2008-mxcurioni/release/freedesktop/icons/48x48/apps/blender.png
branches/soc-2008-mxcurioni/release/freedesktop/icons/48x48/blender.png
branches/soc-2008-mxcurioni/release/freedesktop/icons/48x48/blender.svg
branches/soc-2008-mxcurioni/release/freedesktop/icons/64x64/
branches/soc-2008-mxcurioni/release/freedesktop/icons/96x96/
branches/soc-2008-mxcurioni/release/freedesktop/icons/scalable/apps/blender.svg
branches/soc-2008-mxcurioni/release/freedesktop/icons/scalable/blender.svg
Property Changed:
----------------
branches/soc-2008-mxcurioni/
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_node.py
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:34011-36199
+ /trunk/blender:34011-36301
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2011-04-23 15:27:35 UTC (rev
36301)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2011-04-23 22:08:18 UTC (rev
36302)
@@ -31,15 +31,20 @@
# build the libs and objects in it.
if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-message(FATAL_ERROR "CMake generation for blender is not allowed within the
source directory!
-Remove the CMakeCache.txt file and try again from another folder, e.g.:
-
- rm CMakeCache.txt
- cd ..
- mkdir cmake-make
- cd cmake-make
- cmake ../blender
-")
+ if(NOT DEFINED WITH_IN_SOURCE_BUILD)
+ message(FATAL_ERROR
+ "CMake generation for blender is not allowed within the
source directory!"
+ "\n Remove the CMakeCache.txt file and try again from
another folder, e.g.:"
+ "\n "
+ "\n rm CMakeCache.txt"
+ "\n cd .."
+ "\n mkdir cmake-make"
+ "\n cd cmake-make"
+ "\n cmake ../blender"
+ "\n "
+ "\n Alternately define WITH_IN_SOURCE_BUILD to force
this option (not recommended!)"
+ )
+ endif()
endif()
cmake_minimum_required(VERSION 2.8)
Modified:
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
---
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
2011-04-23 15:27:35 UTC (rev 36301)
+++
branches/soc-2008-mxcurioni/build_files/buildbot/config/user-config-player-x86_64.py
2011-04-23 22:08:18 UTC (rev 36302)
@@ -47,7 +47,6 @@
WITH_BF_STATICZLIB = True
BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
-WITH_BF_STATICZLIB = False
WITH_BF_SDL = True
WITH_BF_OGG = False
Modified:
branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
2011-04-23 15:27:35 UTC (rev 36301)
+++ branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
2011-04-23 22:08:18 UTC (rev 36302)
@@ -172,7 +172,8 @@
AUD_FFMPEGReader::AUD_FFMPEGReader(std::string filename) :
m_pkgbuf(AVCODEC_MAX_AUDIO_FRAME_SIZE<<1),
- m_byteiocontext(NULL)
+ m_byteiocontext(NULL),
+ m_membuf(NULL)
{
// open file
if(av_open_input_file(&m_formatCtx, filename.c_str(), NULL, 0, NULL)!=0)
@@ -194,12 +195,15 @@
AUD_FFMPEGReader::AUD_FFMPEGReader(AUD_Reference<AUD_Buffer> buffer) :
m_pkgbuf(AVCODEC_MAX_AUDIO_FRAME_SIZE<<1),
- m_membuffer(buffer)
+ m_membuffer(buffer),
+ m_membufferpos(0)
{
- m_byteiocontext = (ByteIOContext*)av_mallocz(sizeof(ByteIOContext));
+ m_membuf = reinterpret_cast<data_t*>(av_malloc(FF_MIN_BUFFER_SIZE +
FF_INPUT_BUFFER_PADDING_SIZE));
- if(init_put_byte(m_byteiocontext, (data_t*)buffer.get()->getBuffer(),
- buffer.get()->getSize(), 0, NULL,
NULL, NULL, NULL) != 0)
+ m_byteiocontext = av_alloc_put_byte(m_membuf, FF_MIN_BUFFER_SIZE, 0,
this,
+
read_packet, NULL, seek_packet);
+
+ if(!m_byteiocontext)
{
av_free(m_byteiocontext);
AUD_THROW(AUD_ERROR_FILE, fileopen_error);
@@ -207,7 +211,7 @@
AVProbeData probe_data;
probe_data.filename = "";
- probe_data.buf = (data_t*)buffer.get()->getBuffer();
+ probe_data.buf = reinterpret_cast<data_t*>(buffer.get()->getBuffer());
probe_data.buf_size = buffer.get()->getSize();
AVInputFormat* fmt = av_probe_input_format(&probe_data, 1);
@@ -243,6 +247,40 @@
av_close_input_file(m_formatCtx);
}
+int AUD_FFMPEGReader::read_packet(void* opaque, uint8_t* buf, int buf_size)
+{
+ AUD_FFMPEGReader* reader = reinterpret_cast<AUD_FFMPEGReader*>(opaque);
+
+ int size = AUD_MIN(buf_size, reader->m_membuffer.get()->getSize() -
reader->m_membufferpos);
+
+ if(size < 0)
+ return -1;
+
+ memcpy(buf, ((data_t*)reader->m_membuffer.get()->getBuffer()) +
reader->m_membufferpos, size);
+ reader->m_membufferpos += size;
+
+ return size;
+}
+
+int64_t AUD_FFMPEGReader::seek_packet(void* opaque, int64_t offset, int whence)
+{
+ AUD_FFMPEGReader* reader = reinterpret_cast<AUD_FFMPEGReader*>(opaque);
+
+ switch(whence)
+ {
+ case SEEK_SET:
+ reader->m_membufferpos = 0;
+ break;
+ case SEEK_END:
+ reader->m_membufferpos = reader->m_membuffer.get()->getSize();
+ break;
+ case AVSEEK_SIZE:
+ return reader->m_membuffer.get()->getSize();
+ }
+
+ return (reader->m_membufferpos += offset);
+}
+
bool AUD_FFMPEGReader::isSeekable() const
{
return true;
Modified: branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
2011-04-23 15:27:35 UTC (rev 36301)
+++ branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
2011-04-23 22:08:18 UTC (rev 36302)
@@ -106,11 +106,21 @@
AUD_convert_f m_convert;
/**
- * The memory file to read from, only saved to keep the buffer alive.
+ * The memory file to read from.
*/
AUD_Reference<AUD_Buffer> m_membuffer;
/**
+ * The buffer to read with.
+ */
+ data_t* m_membuf;
+
+ /**
+ * Reading position of the buffer.
+ */
+ int64_t m_membufferpos;
+
+ /**
* Decodes a packet into the given buffer.
* \param packet The AVPacket to decode.
* \param buffer The target buffer.
@@ -149,6 +159,9 @@
*/
virtual ~AUD_FFMPEGReader();
+ static int read_packet(void* opaque, uint8_t* buf, int buf_size);
+ static int64_t seek_packet(void* opaque, int64_t offset, int whence);
+
virtual bool isSeekable() const;
virtual void seek(int position);
virtual int getLength() const;
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp
2011-04-23 15:27:35 UTC (rev 36301)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp
2011-04-23 22:08:18 UTC (rev 36302)
@@ -403,7 +403,7 @@
{
GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
GHOST_TSuccess result;
- bool isdown;
+ bool isdown= false;
result = system->getModifierKeyState(mask, isdown);
*isDown = (int) isdown;
@@ -419,7 +419,7 @@
{
GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
GHOST_TSuccess result;
- bool isdown;
+ bool isdown= false;
result = system->getButtonState(mask, isdown);
*isDown = (int) isdown;
Modified: branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
2011-04-23 15:27:35 UTC (rev 36301)
+++ branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
2011-04-23 22:08:18 UTC (rev 36302)
@@ -369,16 +369,16 @@
{
#include <fcntl.h>
- int fd;
- fd = open("/dev/zero", O_RDWR);
+ int fd;
+ fd = open("/dev/zero", O_RDWR);
- memh= mmap(0, len+sizeof(MemHead)+sizeof(MemTail),
- PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
- close(fd);
+ memh= mmap(0, len+sizeof(MemHead)+sizeof(MemTail),
+ PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+ close(fd);
}
#else
memh= mmap(NULL, len+sizeof(MemHead)+sizeof(MemTail),
- PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANON, -1, 0);
+ PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANON, -1, 0);
#endif
if(memh!=(MemHead *)-1) {
@@ -698,26 +698,26 @@
static void rem_memblock(MemHead *memh)
{
- remlink(membase,&memh->next);
- if (memh->prev) {
- if (memh->next)
+ remlink(membase,&memh->next);
+ if (memh->prev) {
+ if (memh->next)
MEMNEXT(memh->prev)->nextname =
MEMNEXT(memh->next)->name;
- else
+ else
MEMNEXT(memh->prev)->nextname = NULL;
- }
+ }
- totblock--;
- mem_in_use -= memh->len;
-
- if(memh->mmap) {
- mmap_in_use -= memh->len;
- if (munmap(memh, memh->len + sizeof(MemHead) + sizeof(MemTail)))
- printf("Couldn't unmap memory %s\n", memh->name);
- }
+ totblock--;
+ mem_in_use -= memh->len;
+
+ if(memh->mmap) {
+ mmap_in_use -= memh->len;
+ if (munmap(memh, memh->len + sizeof(MemHead) + sizeof(MemTail)))
+ printf("Couldn't unmap memory %s\n", memh->name);
+ }
else {
if(malloc_debug_memset && memh->len)
memset(memh+1, 255, memh->len);
- free(memh);
+ free(memh);
}
}
@@ -792,7 +792,7 @@
forwok->nextname = backok->name;
} else{
forwok->next = NULL;
- membase->last = (struct localLink *)
&forwok->next;
+ membase->last = (struct localLink *)
&forwok->next;
/* membase->last = (struct Link *) &forwok->next;
*/
}
} else{
Modified: branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mmap_win.c
===================================================================
--- branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mmap_win.c
2011-04-23 15:27:35 UTC (rev 36301)
+++ branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mmap_win.c
2011-04-23 22:08:18 UTC (rev 36302)
@@ -114,7 +114,7 @@
/*
if ( fd == -1 ) {
_set_errno( EBADF );
- return MAP_FAILED;
+ return MAP_FAILED;
}
*/
@@ -128,16 +128,16 @@
}
} else {
if ( !DuplicateHandle( GetCurrentProcess(), fhandle,
GetCurrentProcess(),
- &fhandle, 0, FALSE,
DUPLICATE_SAME_ACCESS ) ) {
+ &fhandle, 0, FALSE, DUPLICATE_SAME_ACCESS ) ) {
return MAP_FAILED;
}
}
maphandle = CreateFileMapping(fhandle, NULL, prot_flags, 0, len, NULL);
if ( maphandle == 0 ) {
- errno = EBADF;
+ errno = EBADF;
return MAP_FAILED;
- }
+ }
ptr = MapViewOfFile(maphandle, access_flags, 0, offset, 0);
if ( ptr == NULL ) {
@@ -159,7 +159,7 @@
mm->mmap = ptr;
mmap_addtail(mmapbase, mm);
- return ptr;
+ return ptr;
}
/* munmap for windows */
@@ -168,14 +168,14 @@
MemMap *mm = mmap_findlink(mmapbase, ptr);
if (!mm) {
errno=EINVAL;
- return -1;
+ return -1;
}
UnmapViewOfFile( mm->mmap );
CloseHandle( mm->maphandle );
CloseHandle( mm->fhandle);
mmap_remlink(mmapbase, mm);
free(mm);
- return 0;
+ return 0;
}
/* --------------------------------------------------------------------- */
@@ -233,16 +233,16 @@
int prot = PAGE_NOACCESS;
if ( ( flags & PROT_READ ) == PROT_READ ) {
- if ( ( flags & PROT_WRITE ) == PROT_WRITE ) {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
