[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30599] branches/soc-2010-nicks: synched with trunk at revision 30597

Nick Samarin nicks1987 at bigmir.net
Wed Jul 21 22:55:01 CEST 2010


Revision: 30599
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30599
Author:   nicks
Date:     2010-07-21 22:54:53 +0200 (Wed, 21 Jul 2010)

Log Message:
-----------
synched with trunk at revision 30597

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30597

Modified Paths:
--------------
    branches/soc-2010-nicks/CMakeLists.txt
    branches/soc-2010-nicks/Makefile
    branches/soc-2010-nicks/SConstruct
    branches/soc-2010-nicks/build_files/cmake/macros.cmake
    branches/soc-2010-nicks/build_files/scons/tools/Blender.py
    branches/soc-2010-nicks/build_files/scons/tools/btools.py
    branches/soc-2010-nicks/doc/blender.1
    branches/soc-2010-nicks/doc/blender.1.py
    branches/soc-2010-nicks/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
    branches/soc-2010-nicks/extern/libopenjpeg/dwt.c
    branches/soc-2010-nicks/intern/ghost/CMakeLists.txt
    branches/soc-2010-nicks/intern/ghost/SConscript
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_EventDragnDrop.h
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemWin32.h
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_WindowCarbon.cpp
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2010-nicks/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2010-nicks/intern/iksolver/intern/TNT/vec.h
    branches/soc-2010-nicks/intern/itasc/MovingFrame.cpp
    branches/soc-2010-nicks/intern/string/intern/STR_String.cpp
    branches/soc-2010-nicks/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
    branches/soc-2010-nicks/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/soc-2010-nicks/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
    branches/soc-2010-nicks/release/VERSION
    branches/soc-2010-nicks/release/datafiles/splash.png
    branches/soc-2010-nicks/release/freedesktop/blender.desktop
    branches/soc-2010-nicks/release/scripts/io/export_3ds.py
    branches/soc-2010-nicks/release/scripts/io/export_fbx.py
    branches/soc-2010-nicks/release/scripts/io/export_mdd.py
    branches/soc-2010-nicks/release/scripts/io/export_obj.py
    branches/soc-2010-nicks/release/scripts/io/export_ply.py
    branches/soc-2010-nicks/release/scripts/io/export_x3d.py
    branches/soc-2010-nicks/release/scripts/io/import_anim_bvh.py
    branches/soc-2010-nicks/release/scripts/io/import_scene_3ds.py
    branches/soc-2010-nicks/release/scripts/io/import_scene_obj.py
    branches/soc-2010-nicks/release/scripts/io/netrender/master_html.py
    branches/soc-2010-nicks/release/scripts/io/netrender/repath.py
    branches/soc-2010-nicks/release/scripts/io/netrender/slave.py
    branches/soc-2010-nicks/release/scripts/io/netrender/utils.py
    branches/soc-2010-nicks/release/scripts/modules/add_object_utils.py
    branches/soc-2010-nicks/release/scripts/modules/bpy/utils.py
    branches/soc-2010-nicks/release/scripts/modules/bpy_types.py
    branches/soc-2010-nicks/release/scripts/modules/console/complete_calltip.py
    branches/soc-2010-nicks/release/scripts/modules/rigify/__init__.py
    branches/soc-2010-nicks/release/scripts/modules/rigify/arm_biped.py
    branches/soc-2010-nicks/release/scripts/modules/rigify/spine_pivot_flex.py
    branches/soc-2010-nicks/release/scripts/modules/rna_info.py
    branches/soc-2010-nicks/release/scripts/op/console_python.py
    branches/soc-2010-nicks/release/scripts/op/fcurve_euler_filter.py
    branches/soc-2010-nicks/release/scripts/op/mesh.py
    branches/soc-2010-nicks/release/scripts/op/nla.py
    branches/soc-2010-nicks/release/scripts/op/object.py
    branches/soc-2010-nicks/release/scripts/op/presets.py
    branches/soc-2010-nicks/release/scripts/op/sequencer.py
    branches/soc-2010-nicks/release/scripts/op/uv.py
    branches/soc-2010-nicks/release/scripts/op/uvcalc_follow_active.py
    branches/soc-2010-nicks/release/scripts/op/uvcalc_smart_project.py
    branches/soc-2010-nicks/release/scripts/op/vertexpaint_dirt.py
    branches/soc-2010-nicks/release/scripts/presets/interaction/maya.py
    branches/soc-2010-nicks/release/scripts/templates/operator_uv.py
    branches/soc-2010-nicks/release/scripts/ui/properties_data_armature.py
    branches/soc-2010-nicks/release/scripts/ui/properties_data_bone.py
    branches/soc-2010-nicks/release/scripts/ui/properties_data_curve.py
    branches/soc-2010-nicks/release/scripts/ui/properties_data_modifier.py
    branches/soc-2010-nicks/release/scripts/ui/properties_game.py
    branches/soc-2010-nicks/release/scripts/ui/properties_material.py
    branches/soc-2010-nicks/release/scripts/ui/properties_object_constraint.py
    branches/soc-2010-nicks/release/scripts/ui/properties_physics_common.py
    branches/soc-2010-nicks/release/scripts/ui/properties_render.py
    branches/soc-2010-nicks/release/scripts/ui/properties_texture.py
    branches/soc-2010-nicks/release/scripts/ui/properties_world.py
    branches/soc-2010-nicks/release/scripts/ui/space_image.py
    branches/soc-2010-nicks/release/scripts/ui/space_info.py
    branches/soc-2010-nicks/release/scripts/ui/space_sequencer.py
    branches/soc-2010-nicks/release/scripts/ui/space_time.py
    branches/soc-2010-nicks/release/scripts/ui/space_userpref.py
    branches/soc-2010-nicks/release/scripts/ui/space_view3d.py
    branches/soc-2010-nicks/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2010-nicks/release/text/readme.html
    branches/soc-2010-nicks/source/blender/avi/AVI_avi.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_blender.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_brush.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_fcurve.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_object.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_paint.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_particle.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_scene.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2010-nicks/source/blender/blenkernel/BKE_sound.h
    branches/soc-2010-nicks/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/action.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/anim.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/blender.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/brush.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/cloth.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/collision.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/colortools.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/curve.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/font.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/icons.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/image.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/ipo.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/library.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/material.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/mball.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/object.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/particle.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/sca.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/scene.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/softbody.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/sound.c
    branches/soc-2010-nicks/source/blender/blenkernel/intern/world.c
    branches/soc-2010-nicks/source/blender/blenlib/BLI_path_util.h
    branches/soc-2010-nicks/source/blender/blenlib/BLI_pbvh.h
    branches/soc-2010-nicks/source/blender/blenlib/BLI_winstuff.h
    branches/soc-2010-nicks/source/blender/blenlib/intern/fileops.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/math_color.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/math_geom.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/path_util.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/pbvh.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/scanfill.c
    branches/soc-2010-nicks/source/blender/blenlib/intern/storage.c
    branches/soc-2010-nicks/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-nicks/source/blender/blenloader/intern/writefile.c
    branches/soc-2010-nicks/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2010-nicks/source/blender/editors/animation/anim_markers.c
    branches/soc-2010-nicks/source/blender/editors/animation/anim_ops.c
    branches/soc-2010-nicks/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2010-nicks/source/blender/editors/animation/keyframing.c
    branches/soc-2010-nicks/source/blender/editors/armature/armature_intern.h
    branches/soc-2010-nicks/source/blender/editors/armature/armature_ops.c
    branches/soc-2010-nicks/source/blender/editors/armature/editarmature.c
    branches/soc-2010-nicks/source/blender/editors/armature/poseobject.c
    branches/soc-2010-nicks/source/blender/editors/curve/curve_ops.c
    branches/soc-2010-nicks/source/blender/editors/curve/editcurve.c
    branches/soc-2010-nicks/source/blender/editors/curve/editfont.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/SConscript
    branches/soc-2010-nicks/source/blender/editors/datafiles/splash.png.c
    branches/soc-2010-nicks/source/blender/editors/gpencil/gpencil_buttons.c
    branches/soc-2010-nicks/source/blender/editors/include/ED_datafiles.h
    branches/soc-2010-nicks/source/blender/editors/include/UI_interface.h
    branches/soc-2010-nicks/source/blender/editors/interface/interface_icons.c
    branches/soc-2010-nicks/source/blender/editors/interface/interface_regions.c
    branches/soc-2010-nicks/source/blender/editors/interface/interface_style.c
    branches/soc-2010-nicks/source/blender/editors/interface/interface_templates.c
    branches/soc-2010-nicks/source/blender/editors/interface/resources.c
    branches/soc-2010-nicks/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2010-nicks/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2010-nicks/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2010-nicks/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2010-nicks/source/blender/editors/metaball/mball_edit.c
    branches/soc-2010-nicks/source/blender/editors/metaball/mball_ops.c
    branches/soc-2010-nicks/source/blender/editors/object/object_add.c
    branches/soc-2010-nicks/source/blender/editors/object/object_edit.c
    branches/soc-2010-nicks/source/blender/editors/object/object_intern.h
    branches/soc-2010-nicks/source/blender/editors/object/object_ops.c
    branches/soc-2010-nicks/source/blender/editors/object/object_relations.c
    branches/soc-2010-nicks/source/blender/editors/object/object_transform.c
    branches/soc-2010-nicks/source/blender/editors/physics/physics_ops.c
    branches/soc-2010-nicks/source/blender/editors/render/render_preview.c
    branches/soc-2010-nicks/source/blender/editors/screen/screen_edit.c
    branches/soc-2010-nicks/source/blender/editors/screen/screen_ops.c
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/SConscript
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2010-nicks/source/blender/editors/space_action/action_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_file/file_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_file/filelist.c
    branches/soc-2010-nicks/source/blender/editors/space_file/fsmenu.c
    branches/soc-2010-nicks/source/blender/editors/space_file/space_file.c
    branches/soc-2010-nicks/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_image/image_buttons.c
    branches/soc-2010-nicks/source/blender/editors/space_image/image_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_logic/logic_window.c
    branches/soc-2010-nicks/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2010-nicks/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2010-nicks/source/blender/editors/space_nla/nla_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_node/drawnode.c
    branches/soc-2010-nicks/source/blender/editors/space_node/node_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_node/node_state.c
    branches/soc-2010-nicks/source/blender/editors/space_outliner/outliner.c
    branches/soc-2010-nicks/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2010-nicks/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2010-nicks/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2010-nicks/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2010-nicks/source/blender/editors/space_text/text_ops.c
    branches/soc-2010-nicks/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2010-nicks/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2010-nicks/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2010-nicks/source/blender/editors/transform/transform.c
    branches/soc-2010-nicks/source/blender/editors/transform/transform_constraints.c
    branches/soc-2010-nicks/source/blender/editors/transform/transform_conversions.c
    branches/soc-2010-nicks/source/blender/editors/transform/transform_input.c
    branches/soc-2010-nicks/source/blender/gpu/GPU_extensions.h
    branches/soc-2010-nicks/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2010-nicks/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2010-nicks/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2010-nicks/source/blender/imbuf/intern/anim.c
    branches/soc-2010-nicks/source/blender/imbuf/intern/imageprocess.c
    branches/soc-2010-nicks/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2010-nicks/source/blender/imbuf/intern/png.c
    branches/soc-2010-nicks/source/blender/imbuf/intern/thumbs_blend.c
    branches/soc-2010-nicks/source/blender/makesdna/DNA_ID.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_color_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_object_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_sdna_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2010-nicks/source/blender/makesdna/DNA_world_types.h
    branches/soc-2010-nicks/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2010-nicks/source/blender/makesdna/intern/makesdna.c
    branches/soc-2010-nicks/source/blender/makesrna/SConscript
    branches/soc-2010-nicks/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/makesrna/intern/makesrna.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_action.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_animviz.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_color.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_gpencil.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_nla.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_object.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_space.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_timeline.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2010-nicks/source/blender/makesrna/intern/rna_world.c
    branches/soc-2010-nicks/source/blender/makesrna/rna_cleanup/rna_booleans.txt
    branches/soc-2010-nicks/source/blender/makesrna/rna_cleanup/rna_cleaner.py
    branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_screw.c
    branches/soc-2010-nicks/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2010-nicks/source/blender/nodes/intern/CMP_util.c
    branches/soc-2010-nicks/source/blender/python/doc/epy/Geometry.py
    branches/soc-2010-nicks/source/blender/python/doc/examples/bpy.data.py
    branches/soc-2010-nicks/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2010-nicks/source/blender/python/generic/bgl.c
    branches/soc-2010-nicks/source/blender/python/generic/blf_api.c
    branches/soc-2010-nicks/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2010-nicks/source/blender/python/generic/geometry.c
    branches/soc-2010-nicks/source/blender/python/generic/mathutils.c
    branches/soc-2010-nicks/source/blender/python/generic/mathutils.h
    branches/soc-2010-nicks/source/blender/python/generic/mathutils_vector.c
    branches/soc-2010-nicks/source/blender/python/intern/bpy.c
    branches/soc-2010-nicks/source/blender/python/intern/bpy_app.c
    branches/soc-2010-nicks/source/blender/python/intern/bpy_rna.c
    branches/soc-2010-nicks/source/blender/render/SConscript
    branches/soc-2010-nicks/source/blender/render/intern/raytrace/reorganize.h
    branches/soc-2010-nicks/source/blender/render/intern/source/convertblender.c
    branches/soc-2010-nicks/source/blender/render/intern/source/pipeline.c
    branches/soc-2010-nicks/source/blender/render/intern/source/texture.c
    branches/soc-2010-nicks/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2010-nicks/source/blender/windowmanager/SConscript
    branches/soc-2010-nicks/source/blender/windowmanager/WM_api.h
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_draw.c
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2010-nicks/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2010-nicks/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2010-nicks/source/creator/CMakeLists.txt
    branches/soc-2010-nicks/source/creator/creator.c
    branches/soc-2010-nicks/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/soc-2010-nicks/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/soc-2010-nicks/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_Camera.cpp
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_Camera.h
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2010-nicks/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/soc-2010-nicks/source/gameengine/Network/NG_NetworkScene.cpp
    branches/soc-2010-nicks/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2010-nicks/source/gameengine/PyDoc/VideoTexture.py
    branches/soc-2010-nicks/source/gameengine/PyDoc/bge.logic.rst
    branches/soc-2010-nicks/source/gameengine/PyDoc/bge.render.rst
    branches/soc-2010-nicks/source/gameengine/PyDoc/bge.types.rst

Added Paths:
-----------
    branches/soc-2010-nicks/bin/blender-thumbnailer.py
    branches/soc-2010-nicks/build_files/cmake/example_scripts/
    branches/soc-2010-nicks/build_files/cmake/example_scripts/cmake_linux_install.sh
    branches/soc-2010-nicks/build_files/make/nan_compile.mk
    branches/soc-2010-nicks/build_files/make/nan_definitions.mk
    branches/soc-2010-nicks/build_files/make/nan_link.mk
    branches/soc-2010-nicks/build_files/make/nan_subdirs.mk
    branches/soc-2010-nicks/build_files/make/nan_warn.mk
    branches/soc-2010-nicks/release/datafiles/brushicons/
    branches/soc-2010-nicks/release/datafiles/brushicons/add.png
    branches/soc-2010-nicks/release/datafiles/brushicons/blob.png
    branches/soc-2010-nicks/release/datafiles/brushicons/blur.png
    branches/soc-2010-nicks/release/datafiles/brushicons/clay.png
    branches/soc-2010-nicks/release/datafiles/brushicons/clone.png
    branches/soc-2010-nicks/release/datafiles/brushicons/crease.png
    branches/soc-2010-nicks/release/datafiles/brushicons/darken.png
    branches/soc-2010-nicks/release/datafiles/brushicons/draw.png
    branches/soc-2010-nicks/release/datafiles/brushicons/fill.png
    branches/soc-2010-nicks/release/datafiles/brushicons/flatten.png
    branches/soc-2010-nicks/release/datafiles/brushicons/grab.png
    branches/soc-2010-nicks/release/datafiles/brushicons/inflate.png
    branches/soc-2010-nicks/release/datafiles/brushicons/layer.png
    branches/soc-2010-nicks/release/datafiles/brushicons/lighten.png
    branches/soc-2010-nicks/release/datafiles/brushicons/mix.png
    branches/soc-2010-nicks/release/datafiles/brushicons/multiply.png
    branches/soc-2010-nicks/release/datafiles/brushicons/nudge.png
    branches/soc-2010-nicks/release/datafiles/brushicons/pinch.png
    branches/soc-2010-nicks/release/datafiles/brushicons/scrape.png
    branches/soc-2010-nicks/release/datafiles/brushicons/smear.png
    branches/soc-2010-nicks/release/datafiles/brushicons/smooth.png
    branches/soc-2010-nicks/release/datafiles/brushicons/snake_hook.png
    branches/soc-2010-nicks/release/datafiles/brushicons/soften.png
    branches/soc-2010-nicks/release/datafiles/brushicons/subtract.png
    branches/soc-2010-nicks/release/datafiles/brushicons/texdraw.png
    branches/soc-2010-nicks/release/datafiles/brushicons/thumb.png
    branches/soc-2010-nicks/release/datafiles/brushicons/twist.png
    branches/soc-2010-nicks/release/datafiles/brushicons/vertexdraw.png
    branches/soc-2010-nicks/source/blender/editors/datafiles/add.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/blob.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/blur.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/clay.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/clone.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/crease.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/darken.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/draw.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/fill.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/flatten.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/grab.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/inflate.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/layer.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/lighten.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/mix.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/multiply.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/nudge.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/pinch.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/scrape.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/smear.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/smooth.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/snake_hook.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/soften.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/startup.blend.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/subtract.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/texdraw.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/thumb.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/twist.png.c
    branches/soc-2010-nicks/source/blender/editors/datafiles/vertexdraw.png.c
    branches/soc-2010-nicks/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/soc-2010-nicks/source/blender/gpu/GPU_buffers.h
    branches/soc-2010-nicks/source/blender/makesrna/rna_cleanup/rna_properties.txt
    branches/soc-2010-nicks/source/blender/python/generic/noise.c

Removed Paths:
-------------
    branches/soc-2010-nicks/build_files/cmake/example_scripts/cmake_linux_install.sh
    branches/soc-2010-nicks/release/datafiles/brushicons/add.png
    branches/soc-2010-nicks/release/datafiles/brushicons/blob.png
    branches/soc-2010-nicks/release/datafiles/brushicons/blur.png
    branches/soc-2010-nicks/release/datafiles/brushicons/clay.png
    branches/soc-2010-nicks/release/datafiles/brushicons/clone.png
    branches/soc-2010-nicks/release/datafiles/brushicons/crease.png
    branches/soc-2010-nicks/release/datafiles/brushicons/darken.png
    branches/soc-2010-nicks/release/datafiles/brushicons/draw.png
    branches/soc-2010-nicks/release/datafiles/brushicons/fill.png
    branches/soc-2010-nicks/release/datafiles/brushicons/flatten.png
    branches/soc-2010-nicks/release/datafiles/brushicons/grab.png
    branches/soc-2010-nicks/release/datafiles/brushicons/inflate.png
    branches/soc-2010-nicks/release/datafiles/brushicons/layer.png
    branches/soc-2010-nicks/release/datafiles/brushicons/lighten.png
    branches/soc-2010-nicks/release/datafiles/brushicons/mix.png
    branches/soc-2010-nicks/release/datafiles/brushicons/multiply.png
    branches/soc-2010-nicks/release/datafiles/brushicons/nudge.png
    branches/soc-2010-nicks/release/datafiles/brushicons/pinch.png
    branches/soc-2010-nicks/release/datafiles/brushicons/scrape.png
    branches/soc-2010-nicks/release/datafiles/brushicons/smear.png
    branches/soc-2010-nicks/release/datafiles/brushicons/smooth.png
    branches/soc-2010-nicks/release/datafiles/brushicons/snake_hook.png
    branches/soc-2010-nicks/release/datafiles/brushicons/soften.png
    branches/soc-2010-nicks/release/datafiles/brushicons/subtract.png
    branches/soc-2010-nicks/release/datafiles/brushicons/texdraw.png
    branches/soc-2010-nicks/release/datafiles/brushicons/thumb.png
    branches/soc-2010-nicks/release/datafiles/brushicons/twist.png
    branches/soc-2010-nicks/release/datafiles/brushicons/vertexdraw.png
    branches/soc-2010-nicks/source/blender/editors/datafiles/B.blend.c
    branches/soc-2010-nicks/source/blender/gpu/gpu_buffers.h
    branches/soc-2010-nicks/source/nan_compile.mk
    branches/soc-2010-nicks/source/nan_definitions.mk
    branches/soc-2010-nicks/source/nan_link.mk
    branches/soc-2010-nicks/source/nan_subdirs.mk
    branches/soc-2010-nicks/source/nan_warn.mk

Property Changed:
----------------
    branches/soc-2010-nicks/release/scripts/io/import_scene_3ds.py
    branches/soc-2010-nicks/release/scripts/ui/properties_data_curve.py
    branches/soc-2010-nicks/release/scripts/ui/properties_object.py
    branches/soc-2010-nicks/release/scripts/ui/properties_object_constraint.py
    branches/soc-2010-nicks/release/scripts/ui/properties_physics_cloth.py
    branches/soc-2010-nicks/release/scripts/ui/properties_physics_common.py
    branches/soc-2010-nicks/release/scripts/ui/properties_physics_softbody.py
    branches/soc-2010-nicks/release/scripts/ui/properties_render.py
    branches/soc-2010-nicks/release/scripts/ui/properties_scene.py
    branches/soc-2010-nicks/release/scripts/ui/space_userpref.py

Modified: branches/soc-2010-nicks/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicks/CMakeLists.txt	2010-07-21 19:49:43 UTC (rev 30598)
+++ branches/soc-2010-nicks/CMakeLists.txt	2010-07-21 20:54:53 UTC (rev 30599)
@@ -55,10 +55,6 @@
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
 SET(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/lib)
 
-# Note! - Could create this from the blender version string
-# ...but thats quite involved, make sure this matches the blender version.
-SET(BLENDER_VERSION  2.5)
-
 #-----------------------------------------------------------------------------
 # Load some macros.
 INCLUDE(build_files/cmake/macros.cmake)
@@ -66,6 +62,8 @@
 #-----------------------------------------------------------------------------
 # Set default config options
 
+GET_BLENDER_VERSION()
+
 # Blender internal features
 OPTION(WITH_INTERNATIONAL "Enable I18N   (International fonts and text)" ON)
 OPTION(WITH_LCMS          "Enable color correction with lcms" OFF)
@@ -628,6 +626,12 @@
 			SET(WITH_JACK OFF)
 		ENDIF(WITH_JACK)
 
+		IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
+			SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}")
+			ADD_DEFINITIONS(-D__SSE__)
+			ADD_DEFINITIONS(-D__MMX__)
+		ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
+
 	ENDIF(MSVC)
 
 ENDIF(WIN32)

Modified: branches/soc-2010-nicks/Makefile
===================================================================
--- branches/soc-2010-nicks/Makefile	2010-07-21 19:49:43 UTC (rev 30598)
+++ branches/soc-2010-nicks/Makefile	2010-07-21 20:54:53 UTC (rev 30599)
@@ -41,7 +41,7 @@
 # export NAN_NO_OPENAL=true
 
 export NANBLENDERHOME=$(shell pwd)
-MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory
+MAKEFLAGS=-I$(NANBLENDERHOME)/build_files/make --no-print-directory
 
 SOURCEDIR = 
 ifeq ($(FREE_WINDOWS),true)
@@ -50,7 +50,7 @@
     DIRS ?= extern intern source po
 endif
 
-include source/nan_subdirs.mk
+include build_files/make/nan_subdirs.mk
 
 .PHONY: release
 release:

Modified: branches/soc-2010-nicks/SConstruct
===================================================================
--- branches/soc-2010-nicks/SConstruct	2010-07-21 19:49:43 UTC (rev 30598)
+++ branches/soc-2010-nicks/SConstruct	2010-07-21 20:54:53 UTC (rev 30599)
@@ -46,20 +46,22 @@
 import re
 from tempfile import mkdtemp
 
+# store path to tools
+toolpath=os.path.join(".", "build_files", "scons", "tools")
+
 # needed for importing tools
-sys.path.append(os.path.join(".", "build_files", "scons"))
+sys.path.append(toolpath)
 
-import tools.Blender
-import tools.btools
-import tools.bcolors
+import Blender
+import btools
+import bcolors
 
 EnsureSConsVersion(1,0,0)
 
-BlenderEnvironment = tools.Blender.BlenderEnvironment
-btools = tools.btools
-B = tools.Blender
+BlenderEnvironment = Blender.BlenderEnvironment
+B = Blender
 
-VERSION = tools.btools.VERSION # This is used in creating the local config directories
+VERSION = btools.VERSION # This is used in creating the local config directories
 
 ### globals ###
 platform = sys.platform
@@ -122,7 +124,7 @@
 	print "Using " + toolset
 	if toolset=='mstoolkit':
 		env = BlenderEnvironment(ENV = os.environ)
-		env.Tool('mstoolkit', ['tools'])
+		env.Tool('mstoolkit', [toolpath])
 	else:
 		env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
 		# xxx commented out, as was supressing warnings under mingw..
@@ -171,7 +173,7 @@
 
 if crossbuild and env['PLATFORM'] != 'win32':
 	print B.bc.HEADER+"Preparing for crossbuild"+B.bc.ENDC
-	env.Tool('crossmingw', ['tools'])
+	env.Tool('crossmingw', [toolpath])
 	# todo: determine proper libs/includes etc.
 	# Needed for gui programs, console programs should do without it
 
@@ -628,9 +630,6 @@
 					'${BF_FFMPEG_LIBPATH}/avdevice-52.dll',
 					'${BF_FFMPEG_LIBPATH}/avutil-50.dll',
 					'${BF_FFMPEG_LIBPATH}/swscale-0.dll']
-
-	if env['WITH_BF_JACK']:
-		dllsources += ['${LCGDIR}/jack/lib/libjack.dll']
 	windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
 	allinstall += windlls
 

Copied: branches/soc-2010-nicks/bin/blender-thumbnailer.py (from rev 30597, trunk/blender/bin/blender-thumbnailer.py)
===================================================================
--- branches/soc-2010-nicks/bin/blender-thumbnailer.py	                        (rev 0)
+++ branches/soc-2010-nicks/bin/blender-thumbnailer.py	2010-07-21 20:54:53 UTC (rev 30599)
@@ -0,0 +1,131 @@
+#!/usr/bin/python
+
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License
+#  as published by the Free Software Foundation; either version 2
+#  of the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software Foundation,
+#  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+"""
+Thumbnailer runs with python 2.6 and 3.x.
+To run automatically with nautilus:
+   gconftool --type boolean --set /desktop/gnome/thumbnailers/application at x-blender/enable true
+   gconftool --type string --set /desktop/gnome/thumbnailers/application at x-blender/command "blender-thumbnailer.py %i %o"
+"""
+
+import struct
+
+def blend_extract_thumb(path):
+    import os
+
+    # def MAKE_ID(tag): ord(tag[0])<<24 | ord(tag[1])<<16 | ord(tag[2])<<8 | ord(tag[3])
+    REND = 1145980242 # MAKE_ID(b'REND')
+    TEST = 1414743380 # MAKE_ID(b'TEST')
+
+    blendfile = open(path, 'rb')
+
+    head = blendfile.read(12)
+
+    if head[0:2] == b'\x1f\x8b': # gzip magic
+        import gzip
+        blendfile.close()
+        blendfile = gzip.open(path, 'rb')
+        head = blendfile.read(12)
+
+    if not head.startswith(b'BLENDER'):
+        blendfile.close()
+        return None, 0, 0
+
+    is_64_bit = (head[7] == b'-')
+
+    # true for PPC, false for X86
+    is_big_endian = (head[8] == b'V')
+
+    # blender pre 2.5 had no thumbs
+    if head[9:11] <= b'24':
+        return None, 0, 0
+
+    sizeof_bhead = 24 if is_64_bit else 20
+    int_endian_pair = '>ii' if is_big_endian else '<ii'
+
+    while True:
+        bhead = blendfile.read(sizeof_bhead)
+
+        if len(bhead) < sizeof_bhead:
+            return None, 0, 0
+
+        code, length = struct.unpack(int_endian_pair, bhead[0:8]) # 8 == sizeof(int) * 2
+
+        if code == REND:
+            blendfile.seek(length, os.SEEK_CUR)
+        else:
+            break
+            
+    
+    if code != TEST:
+        return None, 0, 0
+
+    try:
+        x, y = struct.unpack(int_endian_pair, blendfile.read(8)) # 8 == sizeof(int) * 2
+    except struct.error:
+        return None, 0, 0
+
+    length -= 8 # sizeof(int) * 2
+
+    if length != x * y * 4:
+        return None, 0, 0
+
+    image_buffer = blendfile.read(length)
+
+    if len(image_buffer) != length:
+        return None, 0, 0
+
+    return image_buffer, x, y
+
+
+def write_png(buf, width, height):
+    import zlib
+
+    # reverse the vertical line order and add null bytes at the start
+    width_byte_4 = width * 4
+    raw_data = b"".join([b'\x00' + buf[span:span + width_byte_4] for span in range((height - 1) * width * 4, -1, - width_byte_4)])
+
+    def png_pack(png_tag, data):
+        chunk_head = png_tag + data
+        return struct.pack("!I", len(data)) + chunk_head + struct.pack("!I", 0xFFFFFFFF & zlib.crc32(chunk_head))
+
+    return b"".join([
+        b'\x89PNG\r\n\x1a\n',
+        png_pack(b'IHDR', struct.pack("!2I5B", width, height, 8, 6, 0, 0, 0)),
+        png_pack(b'IDAT', zlib.compress(raw_data, 9)),
+        png_pack(b'IEND', b'')])
+
+
+if __name__ == '__main__':
+    import sys
+
+    if len(sys.argv) < 2:
+        print("Expected 2 arguments <input.blend> <output.png>")
+    else:
+        file_in = sys.argv[-2]
+
+        buf, width, height = blend_extract_thumb(file_in)
+        
+        if buf:
+            file_out = sys.argv[-1]
+
+            f = open(file_out, "wb")
+            f.write(write_png(buf, width, height))
+            f.close()

Copied: branches/soc-2010-nicks/build_files/cmake/example_scripts (from rev 30597, trunk/blender/build_files/cmake/example_scripts)

Deleted: branches/soc-2010-nicks/build_files/cmake/example_scripts/cmake_linux_install.sh
===================================================================
--- trunk/blender/build_files/cmake/example_scripts/cmake_linux_install.sh	2010-07-21 19:44:59 UTC (rev 30597)
+++ branches/soc-2010-nicks/build_files/cmake/example_scripts/cmake_linux_install.sh	2010-07-21 20:54:53 UTC (rev 30599)
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# This shell script checks out and compiles blender, tested on ubuntu 10.04
-# assumes you have dependancies installed alredy
-
-# See this page for more info:
-#  http://wiki.blender.org/index.php/Dev:2.5/Doc/Building_Blender/Linux/Generic_Distro/CMake
-
-# grab blender
-mkdir ~/blender-svn 
-cd ~/blender-svn
-svn co https://svn.blender.org/svnroot/bf-blender/trunk/blender
-
-# create cmake dir
-mkdir ~/blender-svn/build-cmake
-cd ~/blender-svn/build-cmake
-
-# cmake without copying files for fast rebuilds
-# the files from svn will be used in place
-cmake ../blender -DWITH_INSTALL:BOOL=FALSE
-
-# make blender, will take some time
-make
-
-# link the binary to blenders source directory to run quickly
-ln -s ~/blender-svn/build-cmake/bin/blender ~/blender-svn/blender/blender.bin
-
-# useful info
-echo ""
-echo "* Useful Commands *"
-echo "   Run Blender: ~/blender-svn/blender/blender.bin"
-echo "   Update Blender: svn up ~/blender-svn/blender"
-echo "   Reconfigure Blender: cd ~/blender-svn/build-cmake ; cmake ."
-echo "   Build Blender: cd ~/blender-svn/build-cmake ; make"
-echo ""
-
-

Copied: branches/soc-2010-nicks/build_files/cmake/example_scripts/cmake_linux_install.sh (from rev 30597, trunk/blender/build_files/cmake/example_scripts/cmake_linux_install.sh)
===================================================================
--- branches/soc-2010-nicks/build_files/cmake/example_scripts/cmake_linux_install.sh	                        (rev 0)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list