Merged changes in the trunk up to revision 30551.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 20 Jul 2010 19:39:07 +0000 (19:39 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 20 Jul 2010 19:39:07 +0000 (19:39 +0000)
commite423e085f8e4b1a774c7a82ebad10e3a24acfe1a
tree9a5c773872ab4cb6d5ce3fb501e6602cc05807d7
parentbd68a728691032b918b437113c842e5ec715bc85
Merged changes in the trunk up to revision 30551.
200 files changed:
SConstruct
bin/blender-thumbnailer.py [moved from release/freedesktop/blender-thumbnailer.py with 83% similarity]
build_files/scons/tools/btools.py
extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
intern/ghost/intern/GHOST_EventDragnDrop.h
intern/ghost/intern/GHOST_SystemCocoa.h
intern/ghost/intern/GHOST_SystemCocoa.mm
intern/ghost/intern/GHOST_SystemWin32.h
intern/iksolver/intern/TNT/vec.h
intern/itasc/MovingFrame.cpp
intern/string/intern/STR_String.cpp
release/VERSION
release/datafiles/brushicons/blob.png [new file with mode: 0644]
release/datafiles/brushicons/clay.png [new file with mode: 0644]
release/datafiles/brushicons/crease.png [new file with mode: 0644]
release/datafiles/brushicons/draw.png [new file with mode: 0644]
release/datafiles/brushicons/fill.png [new file with mode: 0644]
release/datafiles/brushicons/flatten.png [new file with mode: 0644]
release/datafiles/brushicons/grab.png [new file with mode: 0644]
release/datafiles/brushicons/inflate.png [new file with mode: 0644]
release/datafiles/brushicons/layer.png [new file with mode: 0644]
release/datafiles/brushicons/nudge.png [new file with mode: 0644]
release/datafiles/brushicons/pinch.png [new file with mode: 0644]
release/datafiles/brushicons/scrape.png [new file with mode: 0644]
release/datafiles/brushicons/smooth.png [new file with mode: 0644]
release/datafiles/brushicons/snake_hook.png [new file with mode: 0644]
release/datafiles/brushicons/thumb.png [new file with mode: 0644]
release/datafiles/brushicons/twist.png [new file with mode: 0644]
release/datafiles/splash.png
release/scripts/io/export_3ds.py
release/scripts/io/export_fbx.py
release/scripts/io/export_obj.py
release/scripts/io/import_scene_obj.py
release/scripts/io/netrender/master_html.py
release/scripts/io/netrender/repath.py
release/scripts/io/netrender/slave.py
release/scripts/io/netrender/utils.py
release/scripts/modules/bpy/utils.py
release/scripts/modules/rigify/spine_pivot_flex.py
release/scripts/op/sequencer.py
release/scripts/op/uvcalc_smart_project.py
release/scripts/presets/interaction/maya.py
release/scripts/ui/properties_material.py
release/scripts/ui/properties_render.py
release/scripts/ui/properties_world.py
release/scripts/ui/space_info.py
release/scripts/ui/space_sequencer.py
release/scripts/ui/space_userpref.py
release/scripts/ui/space_view3d.py
release/scripts/ui/space_view3d_toolbar.py
release/text/readme.html
source/blender/avi/AVI_avi.h
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_brush.h
source/blender/blenkernel/BKE_fcurve.h
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/BKE_sound.h
source/blender/blenkernel/intern/action.c
source/blender/blenkernel/intern/brush.c
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/fmodifier.c
source/blender/blenkernel/intern/icons.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/ipo.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/sca.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/softbody.c
source/blender/blenkernel/intern/sound.c
source/blender/blenlib/intern/fileops.c
source/blender/blenlib/intern/math_color.c
source/blender/blenlib/intern/math_geom.c
source/blender/blenlib/intern/path_util.c
source/blender/blenlib/intern/scanfill.c
source/blender/blenlib/intern/storage.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_markers.c
source/blender/editors/animation/anim_ops.c
source/blender/editors/armature/armature_ops.c
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/poseobject.c
source/blender/editors/curve/curve_ops.c
source/blender/editors/datafiles/SConscript
source/blender/editors/datafiles/blob.png.c [new file with mode: 0644]
source/blender/editors/datafiles/clay.png.c [new file with mode: 0644]
source/blender/editors/datafiles/crease.png.c [new file with mode: 0644]
source/blender/editors/datafiles/draw.png.c [new file with mode: 0644]
source/blender/editors/datafiles/fill.png.c [new file with mode: 0644]
source/blender/editors/datafiles/flatten.png.c [new file with mode: 0644]
source/blender/editors/datafiles/grab.png.c [new file with mode: 0644]
source/blender/editors/datafiles/inflate.png.c [new file with mode: 0644]
source/blender/editors/datafiles/layer.png.c [new file with mode: 0644]
source/blender/editors/datafiles/nudge.png.c [new file with mode: 0644]
source/blender/editors/datafiles/pinch.png.c [new file with mode: 0644]
source/blender/editors/datafiles/scrape.png.c [new file with mode: 0644]
source/blender/editors/datafiles/smooth.png.c [new file with mode: 0644]
source/blender/editors/datafiles/snake_hook.png.c [new file with mode: 0644]
source/blender/editors/datafiles/splash.png.c
source/blender/editors/datafiles/startup.blend.c
source/blender/editors/datafiles/thumb.png.c [new file with mode: 0644]
source/blender/editors/datafiles/twist.png.c [new file with mode: 0644]
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh_add.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/metaball/mball_edit.c
source/blender/editors/metaball/mball_ops.c
source/blender/editors/object/object_ops.c
source/blender/editors/object/object_transform.c
source/blender/editors/physics/physics_ops.c
source/blender/editors/render/render_preview.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_stroke.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_action/action_ops.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_file/space_file.c
source/blender/editors/space_graph/graph_ops.c
source/blender/editors/space_logic/logic_window.c
source/blender/editors/space_nla/nla_draw.c
source/blender/editors/space_nla/nla_ops.c
source/blender/editors/space_node/node_ops.c
source/blender/editors/space_node/node_state.c
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_sequencer/sequencer_ops.c
source/blender/editors/space_text/text_ops.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform_conversions.c
source/blender/imbuf/intern/anim.c
source/blender/imbuf/intern/imageprocess.c
source/blender/imbuf/intern/png.c
source/blender/imbuf/intern/thumbs_blend.c
source/blender/makesdna/DNA_actuator_types.h
source/blender/makesdna/DNA_brush_types.h
source/blender/makesdna/DNA_curve_types.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_sdna_types.h
source/blender/makesdna/DNA_world_types.h
source/blender/makesdna/intern/dna_genfile.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_actuator.c
source/blender/makesrna/intern/rna_brush.c
source/blender/makesrna/intern/rna_controller.c
source/blender/makesrna/intern/rna_curve.c
source/blender/makesrna/intern/rna_image.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_sequencer.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/makesrna/intern/rna_world.c
source/blender/makesrna/rna_cleanup/rna_cleaner.py
source/blender/modifiers/intern/MOD_screw.c
source/blender/python/doc/epy/Geometry.py
source/blender/python/generic/blf_api.c
source/blender/python/generic/bpy_internal_import.c
source/blender/python/generic/geometry.c
source/blender/python/generic/mathutils.c
source/blender/python/generic/mathutils.h
source/blender/python/generic/mathutils_vector.c
source/blender/python/generic/noise.c [new file with mode: 0644]
source/blender/python/intern/bpy.c
source/blender/python/intern/bpy_rna.c
source/blender/render/SConscript
source/blender/render/intern/raytrace/reorganize.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/texture.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_jobs.c
source/blender/windowmanager/intern/wm_operators.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/gameengine/Expressions/PyObjectPlus.cpp
source/gameengine/GameLogic/SCA_PythonController.cpp
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_PythonSeq.cpp
source/gameengine/Network/NG_NetworkScene.cpp
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
source/gameengine/PyDoc/VideoTexture.py