[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31834] branches/soc-2010-nicolasbishop: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r31667 :31833
Nicholas Bishop
nicholasbishop at gmail.com
Thu Sep 9 06:07:30 CEST 2010
Revision: 31834
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31834
Author: nicholasbishop
Date: 2010-09-09 06:07:28 +0200 (Thu, 09 Sep 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r31667:31833
Modified Paths:
--------------
branches/soc-2010-nicolasbishop/CMakeLists.txt
branches/soc-2010-nicolasbishop/build_files/cmake/example_scripts/make_quicky.py
branches/soc-2010-nicolasbishop/doc/BL-license.txt
branches/soc-2010-nicolasbishop/doc/bf-members.txt
branches/soc-2010-nicolasbishop/doc/blender.1.py
branches/soc-2010-nicolasbishop/extern/binreloc/CMakeLists.txt
branches/soc-2010-nicolasbishop/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
branches/soc-2010-nicolasbishop/extern/glew/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/audaspace/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2010-nicolasbishop/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2010-nicolasbishop/intern/audaspace/intern/AUD_C-API.h
branches/soc-2010-nicolasbishop/intern/decimation/test/decimate_glut_test/intern/common/Makefile
branches/soc-2010-nicolasbishop/intern/ghost/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/ghost/SConscript
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2010-nicolasbishop/intern/ghost/intern/GHOST_WindowManager.cpp
branches/soc-2010-nicolasbishop/intern/smoke/CMakeLists.txt
branches/soc-2010-nicolasbishop/projectfiles/gameengine/gameplayer/ghost/GP_ghost.dsp
branches/soc-2010-nicolasbishop/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
branches/soc-2010-nicolasbishop/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
branches/soc-2010-nicolasbishop/release/freedesktop/blender.desktop
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/modules/add_object_utils.py
branches/soc-2010-nicolasbishop/release/scripts/modules/blend_render_info.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/ops.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/path.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpy/utils.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpy_types.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpyml.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpyml_ui.py
branches/soc-2010-nicolasbishop/release/scripts/modules/graphviz_export.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rna_info.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rna_prop_ui.py
branches/soc-2010-nicolasbishop/release/scripts/op/add_armature_human.py
branches/soc-2010-nicolasbishop/release/scripts/op/add_mesh_torus.py
branches/soc-2010-nicolasbishop/release/scripts/op/animsys_update.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/mesh.py
branches/soc-2010-nicolasbishop/release/scripts/op/nla.py
branches/soc-2010-nicolasbishop/release/scripts/op/object.py
branches/soc-2010-nicolasbishop/release/scripts/op/object_randomize_transform.py
branches/soc-2010-nicolasbishop/release/scripts/op/presets.py
branches/soc-2010-nicolasbishop/release/scripts/op/screen_play_rendered_anim.py
branches/soc-2010-nicolasbishop/release/scripts/op/uv.py
branches/soc-2010-nicolasbishop/release/scripts/op/wm.py
branches/soc-2010-nicolasbishop/release/scripts/presets/interaction/blender.py
branches/soc-2010-nicolasbishop/release/scripts/presets/interaction/maya.py
branches/soc-2010-nicolasbishop/release/scripts/templates/operator.py
branches/soc-2010-nicolasbishop/release/scripts/templates/operator_modal.py
branches/soc-2010-nicolasbishop/release/scripts/templates/operator_modal_draw.py
branches/soc-2010-nicolasbishop/release/scripts/templates/operator_modal_view3d.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_animviz.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_armature.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_bone.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_curve.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_empty.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_lamp.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_lattice.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_mesh.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_game.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_object_constraint.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_particle.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_cloth.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_common.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_field.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_fluid.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_smoke.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_softbody.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_render.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_scene.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_texture.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_world.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_dopesheet.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_filebrowser.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_logic.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_node.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_sequencer.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_text.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/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-nicolasbishop/release/windows/extra/Help.url
branches/soc-2010-nicolasbishop/release/windows/installer/00.sconsblender.nsi
branches/soc-2010-nicolasbishop/source/blender/avi/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/blenfont/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_material.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_modifier.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_multires.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_particle.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_texture.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/anim.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/blender.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/boids.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/brush.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/context.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/font.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/material.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/mesh.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/modifier.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/multires.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/particle_system.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/report.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/sca.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/texture.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/writefile.c
branches/soc-2010-nicolasbishop/source/blender/blenpluginapi/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/collada/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/collada/DocumentImporter.cpp
branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/anim_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/armature/armature_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/editarmature.c
branches/soc-2010-nicolasbishop/source/blender/editors/curve/curve_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/curve/curve_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/curve/editcurve.c
branches/soc-2010-nicolasbishop/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2010-nicolasbishop/source/blender/editors/gpencil/gpencil_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/include/UI_icons.h
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_templates.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_widgets.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_add.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/loopcut.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/mesh_data.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/mesh_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/mesh_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_add.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_modifier.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_transform.c
branches/soc-2010-nicolasbishop/source/blender/editors/physics/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/physics/particle_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/physics/particle_object.c
branches/soc-2010-nicolasbishop/source/blender/editors/render/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/screen/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/screen/screen_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/screen_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/Makefile
branches/soc-2010-nicolasbishop/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform.h
branches/soc-2010-nicolasbishop/source/blender/imbuf/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/scaling.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/thumbs_blend.c
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_define.h
branches/soc-2010-nicolasbishop/source/blender/makesrna/RNA_types.h
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/makesrna.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_ID.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_access.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_color.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_context.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_define.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_fcurve.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_material.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_material_api.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_object.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_rna.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_wm.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_world.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/rna_cleanup/rna_update.sh
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2010-nicolasbishop/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2010-nicolasbishop/source/blender/nodes/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
branches/soc-2010-nicolasbishop/source/blender/nodes/intern/CMP_util.c
branches/soc-2010-nicolasbishop/source/blender/python/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/epy/PhysicsConstraints.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/epy/VideoTexture.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/epy/geometry.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/epy/idprop.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/epyparser.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/examples/aud.Device.lock.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/examples/aud.Factory.filter.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/examples/aud.Factory.join.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/examples/aud.Factory.pingpong.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/examples/aud.Factory.sine.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/examples/idprop.IDGroup.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/examples/idprop.IDGroup.values.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/examples/idprop.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/examples/mathutils.Euler.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/examples/mathutils.Matrix.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/examples/mathutils.Quaternion.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/examples/mathutils.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/mako/cache.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/alternative/mako/ext/preprocessors.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/epy/Geometry.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/epy/IDProp.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/examples/mathutils.Euler.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/examples/mathutils.Matrix.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/examples/mathutils.Quaternion.py
branches/soc-2010-nicolasbishop/source/blender/python/doc/examples/mathutils.py
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/IDProp.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy.h
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_array.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_interface.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_operator.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_props.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_rna.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_rna.h
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_util.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_util.h
branches/soc-2010-nicolasbishop/source/blender/quicktime/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/quicktime/quicktime_import.h
branches/soc-2010-nicolasbishop/source/blender/render/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/imagetexture.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-nicolasbishop/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blenderplayer/bad_level_call_stubs/SConscript
branches/soc-2010-nicolasbishop/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2010-nicolasbishop/source/creator/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/creator/creator.c
branches/soc-2010-nicolasbishop/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/gameengine/Converter/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2010-nicolasbishop/source/gameengine/PyDoc/PhysicsConstraints.py
branches/soc-2010-nicolasbishop/source/gameengine/PyDoc/VideoTexture.py
branches/soc-2010-nicolasbishop/source/gameengine/PyDoc/how_to_build_win.txt
branches/soc-2010-nicolasbishop/source/gameengine/VideoTexture/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/icons/winblender.ico
branches/soc-2010-nicolasbishop/source/kernel/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/kernel/gen_system/GEN_HashedPtr.cpp
Added Paths:
-----------
branches/soc-2010-nicolasbishop/intern/tools/pydna.py
branches/soc-2010-nicolasbishop/release/scripts/modules/io_utils.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_anim_bvh/
branches/soc-2010-nicolasbishop/release/scripts/op/io_anim_bvh/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_anim_bvh/import_bvh.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_mesh_ply/
branches/soc-2010-nicolasbishop/release/scripts/op/io_mesh_ply/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_mesh_ply/export_ply.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_3ds/
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_3ds/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_3ds/export_3ds.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_3ds/import_3ds.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_fbx/
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_fbx/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_fbx/export_fbx.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_obj/
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_obj/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_obj/export_obj.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_obj/import_obj.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_x3d/
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_x3d/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_x3d/export_x3d.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_shape_mdd/
branches/soc-2010-nicolasbishop/release/scripts/op/io_shape_mdd/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_shape_mdd/export_mdd.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_shape_mdd/import_mdd.py
branches/soc-2010-nicolasbishop/release/test/rna_info_dump.py
branches/soc-2010-nicolasbishop/source/blender/python/generic/py_capi_utils.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/py_capi_utils.h
Removed Paths:
-------------
branches/soc-2010-nicolasbishop/release/scripts/io/export_3ds.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_mdd.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_obj.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_ply.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_x3d.py
branches/soc-2010-nicolasbishop/release/scripts/io/import_anim_bvh.py
branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_3ds.py
branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_obj.py
branches/soc-2010-nicolasbishop/release/scripts/io/import_shape_mdd.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_anim_bvh/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_anim_bvh/import_bvh.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_mesh_ply/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_mesh_ply/export_ply.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_3ds/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_3ds/export_3ds.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_3ds/import_3ds.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_fbx/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_fbx/export_fbx.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_obj/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_obj/export_obj.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_obj/import_obj.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_x3d/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_scene_x3d/export_x3d.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_shape_mdd/__init__.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_shape_mdd/export_mdd.py
branches/soc-2010-nicolasbishop/release/scripts/op/io_shape_mdd/import_mdd.py
branches/soc-2010-nicolasbishop/source/icons/wincreator.ico
branches/soc-2010-nicolasbishop/source/icons/wincreator.rc
branches/soc-2010-nicolasbishop/source/icons/winlockedfile.ico
branches/soc-2010-nicolasbishop/source/icons/winplayer.ico
branches/soc-2010-nicolasbishop/source/icons/winplayer.rc
branches/soc-2010-nicolasbishop/source/icons/winpublisher.ico
branches/soc-2010-nicolasbishop/source/icons/winpublisher.rc
Modified: branches/soc-2010-nicolasbishop/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicolasbishop/CMakeLists.txt 2010-09-09 03:58:19 UTC (rev 31833)
+++ branches/soc-2010-nicolasbishop/CMakeLists.txt 2010-09-09 04:07:28 UTC (rev 31834)
@@ -300,7 +300,7 @@
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
# BSD's dont use libdl.so
- SET(LLIBS "${LLIBS} -ldl")
+ LIST(APPEND LLIBS -ldl)
# binreloc is linux only
SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
@@ -308,7 +308,7 @@
ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
IF(WITH_OPENMP)
- SET(LLIBS "${LLIBS} -lgomp")
+ LIST(APPEND LLIBS -lgomp)
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
ENDIF(WITH_OPENMP)
@@ -401,8 +401,7 @@
ENDIF(WITH_QUICKTIME)
IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
- ADD_DEFINITIONS(-D__SSE__)
- ADD_DEFINITIONS(-D__MMX__)
+ ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
IF(MSVC)
@@ -415,11 +414,19 @@
SET(CMAKE_CXX_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305" CACHE STRING "MSVC MT C++ flags " FORCE)
SET(CMAKE_C_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305" CACHE STRING "MSVC MT C++ flags " FORCE)
- SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+ IF(CMAKE_CL_64)
+ SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ ELSE(CMAKE_CL_64)
+ SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+ ENDIF(CMAKE_CL_64)
SET(CMAKE_CXX_FLAGS_RELEASE "/O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
SET(CMAKE_CXX_FLAGS_MINSIZEREL "/O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
- SET(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+ IF(CMAKE_CL_64)
+ SET(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+ ELSE(CMAKE_CL_64)
+ SET(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+ ENDIF(CMAKE_CL_64)
SET(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
SET(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
@@ -857,8 +864,7 @@
IF(CMAKE_COMPILER_IS_GNUCC)
IF(SUPPORT_SSE_BUILD)
SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}")
- ADD_DEFINITIONS(-D__SSE__)
- ADD_DEFINITIONS(-D__MMX__)
+ ADD_DEFINITIONS(-D__SSE__ -D__MMX__)
ENDIF(SUPPORT_SSE_BUILD)
IF(SUPPORT_SSE2_BUILD)
SET(PLATFORM_CFLAGS " -msse2 ${PLATFORM_CFLAGS}")
Modified: branches/soc-2010-nicolasbishop/build_files/cmake/example_scripts/make_quicky.py
===================================================================
--- branches/soc-2010-nicolasbishop/build_files/cmake/example_scripts/make_quicky.py 2010-09-09 03:58:19 UTC (rev 31833)
+++ branches/soc-2010-nicolasbishop/build_files/cmake/example_scripts/make_quicky.py 2010-09-09 04:07:28 UTC (rev 31834)
@@ -20,6 +20,7 @@
# <pep8 compliant>
+
def print_help(targets):
print("CMake quicky wrapper, no valid targets given.")
print(" * targets can contain a subset of the full target name.")
@@ -36,11 +37,11 @@
for t in targets:
print(" %s" % t)
print("...exiting")
-
+
def main():
targets = set()
-
+
# collect targets
file = open("Makefile", "r")
for line in file:
@@ -54,13 +55,12 @@
line = line.split(":", 1)[0]
- if "/" in line: # cmake terget options, dont need these
+ if "/" in line: # cmake terget options, dont need these
continue
targets.add(line)
file.close()
-
# remove cmake targets
bad = set([
"help",
@@ -75,10 +75,9 @@
"depend",
"cmake_check_build_system",
])
-
+
targets -= set(bad)
-
# parse args
targets = list(targets)
targets.sort()
@@ -106,7 +105,7 @@
print(" %s" % t)
print("...aborting.")
return
-
+
# execute
cmd = "make %s %s blender/fast" % (" ".join(args), " ".join(targets_new))
print("cmake building with targets: %s" % " ".join(targets_new))
Modified: branches/soc-2010-nicolasbishop/doc/BL-license.txt
===================================================================
--- branches/soc-2010-nicolasbishop/doc/BL-license.txt 2010-09-09 03:58:19 UTC (rev 31833)
+++ branches/soc-2010-nicolasbishop/doc/BL-license.txt 2010-09-09 04:07:28 UTC (rev 31834)
@@ -32,4 +32,4 @@
Ton Roosendaal
Chairman Blender Foundation.
-June 2005
\ No newline at end of file
+June 2005
Modified: branches/soc-2010-nicolasbishop/doc/bf-members.txt
===================================================================
--- branches/soc-2010-nicolasbishop/doc/bf-members.txt 2010-09-09 03:58:19 UTC (rev 31833)
+++ branches/soc-2010-nicolasbishop/doc/bf-members.txt 2010-09-09 04:07:28 UTC (rev 31834)
@@ -1390,4 +1390,4 @@
James H. Cloos, Jr.
Karl Erlandsen (LethalSideParting)
Kari Pulli
-Dave Shemano
\ No newline at end of file
+Dave Shemano
Modified: branches/soc-2010-nicolasbishop/doc/blender.1.py
===================================================================
--- branches/soc-2010-nicolasbishop/doc/blender.1.py 2010-09-09 03:58:19 UTC (rev 31833)
+++ branches/soc-2010-nicolasbishop/doc/blender.1.py 2010-09-09 04:07:28 UTC (rev 31834)
@@ -91,25 +91,25 @@
l = lines.pop(0)
if l.startswith("Environment Variables:"):
fw('.SH "ENVIRONMENT VARIABLES"\n')
- elif l.endswith(":"): # one line
+ elif l.endswith(":"): # one line
fw('.SS "%s"\n\n' % l)
- elif l.startswith("-") or l.startswith("/"): # can be multi line
+ elif l.startswith("-") or l.startswith("/"): # can be multi line
fw('.TP\n')
fw('.B %s\n' % man_format(l))
while lines:
# line with no
- if lines[0].strip() and len(lines[0].lstrip()) == len(lines[0]): # no white space
+ if lines[0].strip() and len(lines[0].lstrip()) == len(lines[0]): # no white space
break
- if not l: # second blank line
+ if not l: # second blank line
fw('.IP\n')
else:
fw('.br\n')
l = lines.pop(0)
- l = l[1:] # remove first whitespace (tab)
+ l = l[1:] # remove first whitespace (tab)
fw('%s\n' % man_format(l))
Modified: branches/soc-2010-nicolasbishop/extern/binreloc/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicolasbishop/extern/binreloc/CMakeLists.txt 2010-09-09 03:58:19 UTC (rev 31833)
+++ branches/soc-2010-nicolasbishop/extern/binreloc/CMakeLists.txt 2010-09-09 04:07:28 UTC (rev 31834)
@@ -23,4 +23,3 @@
FILE(GLOB SRC *.c)
BLENDERLIB(extern_binreloc "${SRC}" "${INC}")
-#, libtype=['core','player'], priority = [25,15] )
Modified: branches/soc-2010-nicolasbishop/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
===================================================================
--- branches/soc-2010-nicolasbishop/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp 2010-09-09 03:58:19 UTC (rev 31833)
+++ branches/soc-2010-nicolasbishop/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp 2010-09-09 04:07:28 UTC (rev 31834)
@@ -24,12 +24,13 @@
m_shapeType = CONVEX_HULL_SHAPE_PROXYTYPE;
m_unscaledPoints.resize(numPoints);
- unsigned char* pointsBaseAddress = (unsigned char*)points;
+ unsigned char* pointsAddress = (unsigned char*)points;
for (int i=0;i<numPoints;i++)
{
- btVector3* point = (btVector3*)(pointsBaseAddress + i*stride);
- m_unscaledPoints[i] = point[0];
+ btScalar* point = (btScalar*)pointsAddress;
+ m_unscaledPoints[i] = btVector3(point[0], point[1], point[2]);
+ pointsAddress += stride;
}
recalcLocalAabb();
Modified: branches/soc-2010-nicolasbishop/extern/glew/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicolasbishop/extern/glew/CMakeLists.txt 2010-09-09 03:58:19 UTC (rev 31833)
+++ branches/soc-2010-nicolasbishop/extern/glew/CMakeLists.txt 2010-09-09 04:07:28 UTC (rev 31834)
@@ -27,7 +27,7 @@
SET(INC include src)
IF(UNIX)
- SET(INC ${INC} ${X11_X11_INCLUDE_PATH})
+ LIST(APPEND INC ${X11_X11_INCLUDE_PATH})
ENDIF(UNIX)
SET(SRC
@@ -37,4 +37,3 @@
ADD_DEFINITIONS(-DGLEW_STATIC)
BLENDERLIB(extern_glew "${SRC}" "${INC}")
-
Modified: branches/soc-2010-nicolasbishop/intern/audaspace/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicolasbishop/intern/audaspace/CMakeLists.txt 2010-09-09 03:58:19 UTC (rev 31833)
+++ branches/soc-2010-nicolasbishop/intern/audaspace/CMakeLists.txt 2010-09-09 04:07:28 UTC (rev 31834)
@@ -20,48 +20,59 @@
#
# ***** END LGPL LICENSE BLOCK *****
-SET(INC . intern FX SRC ${PTHREADS_INC} ${LIBSAMPLERATE_INC})
+SET(INC
+ .
+ intern
+ FX SRC
+ ${PTHREADS_INC}
+ ${LIBSAMPLERATE_INC}
+)
-FILE(GLOB SRC intern/*.cpp intern/*.h FX/*.cpp SRC/*.cpp)
+FILE(GLOB SRC
+ intern/*.cpp
+ intern/*.h
+ FX/*.cpp
+ SRC/*.cpp
+)
IF(WITH_FFMPEG)
- SET(INC ${INC} ffmpeg ${FFMPEG_INC})
+ LIST(APPEND INC ffmpeg ${FFMPEG_INC})
FILE(GLOB FFMPEGSRC ffmpeg/*.cpp)
ADD_DEFINITIONS(-DWITH_FFMPEG)
ENDIF(WITH_FFMPEG)
IF(WITH_SDL)
- SET(INC ${INC} SDL ${SDL_INCLUDE_DIR})
+ LIST(APPEND INC SDL ${SDL_INCLUDE_DIR})
FILE(GLOB SDLSRC SDL/*.cpp)
ADD_DEFINITIONS(-DWITH_SDL)
ENDIF(WITH_SDL)
IF(WITH_OPENAL)
- SET(INC ${INC} OpenAL ${OPENAL_INCLUDE_DIR})
+ LIST(APPEND INC OpenAL ${OPENAL_INCLUDE_DIR})
FILE(GLOB OPENALSRC OpenAL/*.cpp)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list