[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25181] branches/sculpt25: Sculpt Branch:

Brecht Van Lommel brecht at blender.org
Mon Dec 7 20:22:51 CET 2009 

Revision: 25181
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25181
Author:   blendix
Date:     2009-12-07 20:22:48 +0100 (Mon, 07 Dec 2009)

Log Message:
-----------
Sculpt Branch:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r24889:25180

Modified Paths:
--------------
    branches/sculpt25/CMakeLists.txt
    branches/sculpt25/config/darwin-config.py
    branches/sculpt25/config/linux2-config.py
    branches/sculpt25/config/win32-mingw-config.py
    branches/sculpt25/extern/Eigen2/Eigen/src/Core/util/Macros.h
    branches/sculpt25/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
    branches/sculpt25/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
    branches/sculpt25/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
    branches/sculpt25/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
    branches/sculpt25/extern/bullet2/src/SConscript
    branches/sculpt25/intern/boolop/intern/BOP_Face2Face.cpp
    branches/sculpt25/intern/ghost/CMakeLists.txt
    branches/sculpt25/intern/ghost/SConscript
    branches/sculpt25/intern/ghost/intern/GHOST_Debug.h
    branches/sculpt25/intern/ghost/intern/GHOST_EventPrinter.cpp
    branches/sculpt25/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/sculpt25/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/sculpt25/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/sculpt25/intern/ghost/intern/GHOST_SystemWin32.h
    branches/sculpt25/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/sculpt25/intern/ghost/intern/GHOST_Window.cpp
    branches/sculpt25/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/sculpt25/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/sculpt25/intern/ghost/intern/GHOST_WindowWin32.h
    branches/sculpt25/intern/ghost/make/msvc_9_0/ghost.vcproj
    branches/sculpt25/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
    branches/sculpt25/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/sculpt25/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
    branches/sculpt25/release/datafiles/blenderbuttons
    branches/sculpt25/release/scripts/io/engine_render_pov.py
    branches/sculpt25/release/scripts/io/export_fbx.py
    branches/sculpt25/release/scripts/io/export_obj.py
    branches/sculpt25/release/scripts/io/export_ply.py
    branches/sculpt25/release/scripts/io/import_anim_bvh.py
    branches/sculpt25/release/scripts/io/import_scene_obj.py
    branches/sculpt25/release/scripts/io/netrender/client.py
    branches/sculpt25/release/scripts/io/netrender/operators.py
    branches/sculpt25/release/scripts/modules/bpy/__init__.py
    branches/sculpt25/release/scripts/modules/bpy/ops.py
    branches/sculpt25/release/scripts/modules/bpy/utils.py
    branches/sculpt25/release/scripts/modules/bpy_types.py
    branches/sculpt25/release/scripts/modules/console/complete_import.py
    branches/sculpt25/release/scripts/modules/dynamic_menu.py
    branches/sculpt25/release/scripts/modules/rna_prop_ui.py
    branches/sculpt25/release/scripts/op/console_python.py
    branches/sculpt25/release/scripts/op/console_shell.py
    branches/sculpt25/release/scripts/op/mesh_skin.py
    branches/sculpt25/release/scripts/op/presets.py
    branches/sculpt25/release/scripts/op/uvcalc_smart_project.py
    branches/sculpt25/release/scripts/op/wm.py
    branches/sculpt25/release/scripts/templates/operator.py
    branches/sculpt25/release/scripts/ui/properties_data_bone.py
    branches/sculpt25/release/scripts/ui/properties_data_curve.py
    branches/sculpt25/release/scripts/ui/properties_data_modifier.py
    branches/sculpt25/release/scripts/ui/properties_material.py
    branches/sculpt25/release/scripts/ui/properties_object.py
    branches/sculpt25/release/scripts/ui/properties_object_constraint.py
    branches/sculpt25/release/scripts/ui/properties_particle.py
    branches/sculpt25/release/scripts/ui/properties_physics_cloth.py
    branches/sculpt25/release/scripts/ui/properties_physics_common.py
    branches/sculpt25/release/scripts/ui/properties_render.py
    branches/sculpt25/release/scripts/ui/properties_world.py
    branches/sculpt25/release/scripts/ui/space_console.py
    branches/sculpt25/release/scripts/ui/space_image.py
    branches/sculpt25/release/scripts/ui/space_info.py
    branches/sculpt25/release/scripts/ui/space_node.py
    branches/sculpt25/release/scripts/ui/space_outliner.py
    branches/sculpt25/release/scripts/ui/space_sequencer.py
    branches/sculpt25/release/scripts/ui/space_text.py
    branches/sculpt25/release/scripts/ui/space_time.py
    branches/sculpt25/release/scripts/ui/space_userpref.py
    branches/sculpt25/release/scripts/ui/space_view3d.py
    branches/sculpt25/release/scripts/ui/space_view3d_toolbar.py
    branches/sculpt25/source/blender/blenkernel/BKE_blender.h
    branches/sculpt25/source/blender/blenkernel/BKE_colortools.h
    branches/sculpt25/source/blender/blenkernel/BKE_context.h
    branches/sculpt25/source/blender/blenkernel/BKE_particle.h
    branches/sculpt25/source/blender/blenkernel/BKE_pointcache.h
    branches/sculpt25/source/blender/blenkernel/BKE_screen.h
    branches/sculpt25/source/blender/blenkernel/BKE_texture.h
    branches/sculpt25/source/blender/blenkernel/intern/action.c
    branches/sculpt25/source/blender/blenkernel/intern/armature.c
    branches/sculpt25/source/blender/blenkernel/intern/colortools.c
    branches/sculpt25/source/blender/blenkernel/intern/context.c
    branches/sculpt25/source/blender/blenkernel/intern/depsgraph.c
    branches/sculpt25/source/blender/blenkernel/intern/exotic.c
    branches/sculpt25/source/blender/blenkernel/intern/fcurve.c
    branches/sculpt25/source/blender/blenkernel/intern/ipo.c
    branches/sculpt25/source/blender/blenkernel/intern/modifier.c
    branches/sculpt25/source/blender/blenkernel/intern/object.c
    branches/sculpt25/source/blender/blenkernel/intern/particle.c
    branches/sculpt25/source/blender/blenkernel/intern/particle_system.c
    branches/sculpt25/source/blender/blenkernel/intern/pointcache.c
    branches/sculpt25/source/blender/blenkernel/intern/scene.c
    branches/sculpt25/source/blender/blenkernel/intern/screen.c
    branches/sculpt25/source/blender/blenkernel/intern/sequence.c
    branches/sculpt25/source/blender/blenkernel/intern/softbody.c
    branches/sculpt25/source/blender/blenkernel/intern/texture.c
    branches/sculpt25/source/blender/blenlib/BLI_math_base.h
    branches/sculpt25/source/blender/blenlib/BLI_math_color.h
    branches/sculpt25/source/blender/blenlib/BLI_math_geom.h
    branches/sculpt25/source/blender/blenlib/BLI_util.h
    branches/sculpt25/source/blender/blenlib/intern/math_base.c
    branches/sculpt25/source/blender/blenlib/intern/math_color.c
    branches/sculpt25/source/blender/blenlib/intern/math_geom.c
    branches/sculpt25/source/blender/blenlib/intern/util.c
    branches/sculpt25/source/blender/blenloader/intern/readfile.c
    branches/sculpt25/source/blender/blenloader/intern/writefile.c
    branches/sculpt25/source/blender/collada/DocumentExporter.cpp
    branches/sculpt25/source/blender/collada/DocumentImporter.cpp
    branches/sculpt25/source/blender/collada/collada_internal.h
    branches/sculpt25/source/blender/editors/animation/anim_channels_defines.c
    branches/sculpt25/source/blender/editors/animation/anim_channels_edit.c
    branches/sculpt25/source/blender/editors/animation/anim_filter.c
    branches/sculpt25/source/blender/editors/animation/anim_intern.h
    branches/sculpt25/source/blender/editors/animation/anim_markers.c
    branches/sculpt25/source/blender/editors/animation/anim_ops.c
    branches/sculpt25/source/blender/editors/animation/drivers.c
    branches/sculpt25/source/blender/editors/animation/fmodifier_ui.c
    branches/sculpt25/source/blender/editors/animation/keyframes_draw.c
    branches/sculpt25/source/blender/editors/animation/keyframes_edit.c
    branches/sculpt25/source/blender/editors/animation/keyframes_general.c
    branches/sculpt25/source/blender/editors/animation/keyframing.c
    branches/sculpt25/source/blender/editors/animation/keyingsets.c
    branches/sculpt25/source/blender/editors/armature/armature_intern.h
    branches/sculpt25/source/blender/editors/armature/armature_ops.c
    branches/sculpt25/source/blender/editors/armature/editarmature.c
    branches/sculpt25/source/blender/editors/armature/meshlaplacian.c
    branches/sculpt25/source/blender/editors/armature/meshlaplacian.h
    branches/sculpt25/source/blender/editors/armature/poseSlide.c
    branches/sculpt25/source/blender/editors/armature/poseobject.c
    branches/sculpt25/source/blender/editors/curve/curve_intern.h
    branches/sculpt25/source/blender/editors/curve/curve_ops.c
    branches/sculpt25/source/blender/editors/curve/editcurve.c
    branches/sculpt25/source/blender/editors/datafiles/B.blend.c
    branches/sculpt25/source/blender/editors/datafiles/blenderbuttons.c
    branches/sculpt25/source/blender/editors/gpencil/gpencil_edit.c
    branches/sculpt25/source/blender/editors/gpencil/gpencil_paint.c
    branches/sculpt25/source/blender/editors/include/ED_anim_api.h
    branches/sculpt25/source/blender/editors/include/ED_armature.h
    branches/sculpt25/source/blender/editors/include/ED_curve.h
    branches/sculpt25/source/blender/editors/include/ED_mesh.h
    branches/sculpt25/source/blender/editors/include/ED_object.h
    branches/sculpt25/source/blender/editors/include/ED_particle.h
    branches/sculpt25/source/blender/editors/include/ED_screen.h
    branches/sculpt25/source/blender/editors/include/ED_screen_types.h
    branches/sculpt25/source/blender/editors/include/ED_transform.h
    branches/sculpt25/source/blender/editors/include/ED_view3d.h
    branches/sculpt25/source/blender/editors/include/UI_icons.h
    branches/sculpt25/source/blender/editors/include/UI_interface.h
    branches/sculpt25/source/blender/editors/interface/interface.c
    branches/sculpt25/source/blender/editors/interface/interface_anim.c
    branches/sculpt25/source/blender/editors/interface/interface_draw.c
    branches/sculpt25/source/blender/editors/interface/interface_handlers.c
    branches/sculpt25/source/blender/editors/interface/interface_intern.h
    branches/sculpt25/source/blender/editors/interface/interface_layout.c
    branches/sculpt25/source/blender/editors/interface/interface_regions.c
    branches/sculpt25/source/blender/editors/interface/interface_templates.c
    branches/sculpt25/source/blender/editors/interface/interface_utils.c
    branches/sculpt25/source/blender/editors/interface/interface_widgets.c
    branches/sculpt25/source/blender/editors/mesh/editface.c
    branches/sculpt25/source/blender/editors/mesh/editmesh.c
    branches/sculpt25/source/blender/editors/mesh/editmesh_mods.c
    branches/sculpt25/source/blender/editors/mesh/editmesh_tools.c
    branches/sculpt25/source/blender/editors/mesh/loopcut.c
    branches/sculpt25/source/blender/editors/mesh/mesh_intern.h
    branches/sculpt25/source/blender/editors/mesh/mesh_ops.c
    branches/sculpt25/source/blender/editors/mesh/meshtools.c
    branches/sculpt25/source/blender/editors/metaball/mball_edit.c
    branches/sculpt25/source/blender/editors/metaball/mball_intern.h
    branches/sculpt25/source/blender/editors/metaball/mball_ops.c
    branches/sculpt25/source/blender/editors/object/object_add.c
    branches/sculpt25/source/blender/editors/object/object_constraint.c
    branches/sculpt25/source/blender/editors/object/object_edit.c
    branches/sculpt25/source/blender/editors/object/object_intern.h
    branches/sculpt25/source/blender/editors/object/object_lattice.c
    branches/sculpt25/source/blender/editors/object/object_modifier.c
    branches/sculpt25/source/blender/editors/object/object_ops.c
    branches/sculpt25/source/blender/editors/object/object_relations.c
    branches/sculpt25/source/blender/editors/object/object_select.c
    branches/sculpt25/source/blender/editors/object/object_transform.c
    branches/sculpt25/source/blender/editors/physics/particle_edit.c
    branches/sculpt25/source/blender/editors/physics/particle_object.c
    branches/sculpt25/source/blender/editors/physics/physics_fluid.c
    branches/sculpt25/source/blender/editors/physics/physics_intern.h
    branches/sculpt25/source/blender/editors/physics/physics_ops.c
    branches/sculpt25/source/blender/editors/physics/physics_pointcache.c
    branches/sculpt25/source/blender/editors/render/SConscript
    branches/sculpt25/source/blender/editors/render/render_ops.c
    branches/sculpt25/source/blender/editors/screen/area.c
    branches/sculpt25/source/blender/editors/screen/glutil.c
    branches/sculpt25/source/blender/editors/screen/screen_context.c
    branches/sculpt25/source/blender/editors/screen/screen_edit.c
    branches/sculpt25/source/blender/editors/screen/screen_ops.c
    branches/sculpt25/source/blender/editors/sculpt_paint/paint_intern.h
    branches/sculpt25/source/blender/editors/sculpt_paint/paint_ops.c
    branches/sculpt25/source/blender/editors/sculpt_paint/paint_utils.c
    branches/sculpt25/source/blender/editors/space_action/action_edit.c
    branches/sculpt25/source/blender/editors/space_action/action_header.c
    branches/sculpt25/source/blender/editors/space_action/action_intern.h
    branches/sculpt25/source/blender/editors/space_action/action_ops.c
    branches/sculpt25/source/blender/editors/space_action/action_select.c
    branches/sculpt25/source/blender/editors/space_action/space_action.c
    branches/sculpt25/source/blender/editors/space_buttons/space_buttons.c
    branches/sculpt25/source/blender/editors/space_console/space_console.c
    branches/sculpt25/source/blender/editors/space_file/file_intern.h
    branches/sculpt25/source/blender/editors/space_file/file_ops.c
    branches/sculpt25/source/blender/editors/space_file/file_panels.c
    branches/sculpt25/source/blender/editors/space_file/space_file.c
    branches/sculpt25/source/blender/editors/space_graph/graph_buttons.c
    branches/sculpt25/source/blender/editors/space_graph/graph_draw.c
    branches/sculpt25/source/blender/editors/space_graph/graph_edit.c
    branches/sculpt25/source/blender/editors/space_graph/graph_header.c
    branches/sculpt25/source/blender/editors/space_graph/graph_intern.h
    branches/sculpt25/source/blender/editors/space_graph/graph_ops.c
    branches/sculpt25/source/blender/editors/space_graph/space_graph.c
    branches/sculpt25/source/blender/editors/space_image/space_image.c
    branches/sculpt25/source/blender/editors/space_info/space_info.c
    branches/sculpt25/source/blender/editors/space_logic/logic_window.c
    branches/sculpt25/source/blender/editors/space_logic/space_logic.c
    branches/sculpt25/source/blender/editors/space_nla/nla_buttons.c
    branches/sculpt25/source/blender/editors/space_nla/nla_channels.c
    branches/sculpt25/source/blender/editors/space_nla/nla_edit.c
    branches/sculpt25/source/blender/editors/space_nla/nla_header.c
    branches/sculpt25/source/blender/editors/space_nla/nla_intern.h
    branches/sculpt25/source/blender/editors/space_nla/nla_ops.c
    branches/sculpt25/source/blender/editors/space_nla/space_nla.c
    branches/sculpt25/source/blender/editors/space_node/drawnode.c
    branches/sculpt25/source/blender/editors/space_node/space_node.c
    branches/sculpt25/source/blender/editors/space_outliner/outliner.c
    branches/sculpt25/source/blender/editors/space_outliner/outliner_ops.c
    branches/sculpt25/source/blender/editors/space_outliner/space_outliner.c
    branches/sculpt25/source/blender/editors/space_script/space_script.c
    branches/sculpt25/source/blender/editors/space_sequencer/sequencer_add.c
    branches/sculpt25/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/sculpt25/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/sculpt25/source/blender/editors/space_sequencer/space_sequencer.c
    branches/sculpt25/source/blender/editors/space_sound/space_sound.c
    branches/sculpt25/source/blender/editors/space_text/space_text.c
    branches/sculpt25/source/blender/editors/space_text/text_ops.c
    branches/sculpt25/source/blender/editors/space_time/space_time.c
    branches/sculpt25/source/blender/editors/space_time/time_ops.c
    branches/sculpt25/source/blender/editors/space_userpref/space_userpref.c
    branches/sculpt25/source/blender/editors/space_view3d/drawmesh.c
    branches/sculpt25/source/blender/editors/space_view3d/drawobject.c
    branches/sculpt25/source/blender/editors/space_view3d/space_view3d.c
    branches/sculpt25/source/blender/editors/space_view3d/view3d_buttons.c
    branches/sculpt25/source/blender/editors/space_view3d/view3d_draw.c
    branches/sculpt25/source/blender/editors/space_view3d/view3d_edit.c
    branches/sculpt25/source/blender/editors/space_view3d/view3d_header.c
    branches/sculpt25/source/blender/editors/space_view3d/view3d_ops.c
    branches/sculpt25/source/blender/editors/space_view3d/view3d_select.c
    branches/sculpt25/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/sculpt25/source/blender/editors/space_view3d/view3d_view.c
    branches/sculpt25/source/blender/editors/transform/transform.c
    branches/sculpt25/source/blender/editors/transform/transform.h
    branches/sculpt25/source/blender/editors/transform/transform_constraints.c
    branches/sculpt25/source/blender/editors/transform/transform_conversions.c
    branches/sculpt25/source/blender/editors/transform/transform_generics.c
    branches/sculpt25/source/blender/editors/transform/transform_manipulator.c
    branches/sculpt25/source/blender/editors/transform/transform_ops.c
    branches/sculpt25/source/blender/editors/transform/transform_orientations.c
    branches/sculpt25/source/blender/editors/transform/transform_snap.c
    branches/sculpt25/source/blender/editors/uvedit/uvedit_ops.c
    branches/sculpt25/source/blender/gpu/intern/gpu_draw.c
    branches/sculpt25/source/blender/imbuf/intern/divers.c
    branches/sculpt25/source/blender/imbuf/intern/jpeg.c
    branches/sculpt25/source/blender/makesdna/DNA_action_types.h
    branches/sculpt25/source/blender/makesdna/DNA_armature_types.h
    branches/sculpt25/source/blender/makesdna/DNA_ipo_types.h
    branches/sculpt25/source/blender/makesdna/DNA_modifier_types.h
    branches/sculpt25/source/blender/makesdna/DNA_particle_types.h
    branches/sculpt25/source/blender/makesdna/DNA_scene_types.h
    branches/sculpt25/source/blender/makesdna/DNA_sequence_types.h
    branches/sculpt25/source/blender/makesdna/DNA_space_types.h
    branches/sculpt25/source/blender/makesdna/DNA_userdef_types.h
    branches/sculpt25/source/blender/makesdna/DNA_windowmanager_types.h
    branches/sculpt25/source/blender/makesdna/DNA_world_types.h
    branches/sculpt25/source/blender/makesrna/RNA_access.h
    branches/sculpt25/source/blender/makesrna/RNA_enum_types.h
    branches/sculpt25/source/blender/makesrna/RNA_types.h
    branches/sculpt25/source/blender/makesrna/intern/makesrna.c
    branches/sculpt25/source/blender/makesrna/intern/rna_ID.c
    branches/sculpt25/source/blender/makesrna/intern/rna_access.c
    branches/sculpt25/source/blender/makesrna/intern/rna_action.c
    branches/sculpt25/source/blender/makesrna/intern/rna_armature.c
    branches/sculpt25/source/blender/makesrna/intern/rna_brush.c
    branches/sculpt25/source/blender/makesrna/intern/rna_color.c
    branches/sculpt25/source/blender/makesrna/intern/rna_constraint.c
    branches/sculpt25/source/blender/makesrna/intern/rna_curve.c
    branches/sculpt25/source/blender/makesrna/intern/rna_fcurve.c
    branches/sculpt25/source/blender/makesrna/intern/rna_gpencil.c
    branches/sculpt25/source/blender/makesrna/intern/rna_group.c
    branches/sculpt25/source/blender/makesrna/intern/rna_internal.h
    branches/sculpt25/source/blender/makesrna/intern/rna_main_api.c
    branches/sculpt25/source/blender/makesrna/intern/rna_material.c
    branches/sculpt25/source/blender/makesrna/intern/rna_mesh.c
    branches/sculpt25/source/blender/makesrna/intern/rna_modifier.c
    branches/sculpt25/source/blender/makesrna/intern/rna_object.c
    branches/sculpt25/source/blender/makesrna/intern/rna_object_api.c
    branches/sculpt25/source/blender/makesrna/intern/rna_object_force.c
    branches/sculpt25/source/blender/makesrna/intern/rna_particle.c
    branches/sculpt25/source/blender/makesrna/intern/rna_pose.c
    branches/sculpt25/source/blender/makesrna/intern/rna_rna.c
    branches/sculpt25/source/blender/makesrna/intern/rna_scene.c
    branches/sculpt25/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/sculpt25/source/blender/makesrna/intern/rna_sequence.c
    branches/sculpt25/source/blender/makesrna/intern/rna_space.c
    branches/sculpt25/source/blender/makesrna/intern/rna_texture.c
    branches/sculpt25/source/blender/makesrna/intern/rna_ui_api.c
    branches/sculpt25/source/blender/makesrna/intern/rna_userdef.c
    branches/sculpt25/source/blender/makesrna/intern/rna_wm.c
    branches/sculpt25/source/blender/makesrna/intern/rna_wm_api.c
    branches/sculpt25/source/blender/makesrna/intern/rna_world.c
    branches/sculpt25/source/blender/python/generic/bpy_internal_import.c
    branches/sculpt25/source/blender/python/generic/vector.c
    branches/sculpt25/source/blender/python/intern/bpy_interface.c
    branches/sculpt25/source/blender/python/intern/bpy_operator.c
    branches/sculpt25/source/blender/python/intern/bpy_operator_wrap.c
    branches/sculpt25/source/blender/python/intern/bpy_operator_wrap.h
    branches/sculpt25/source/blender/python/intern/bpy_rna.c
    branches/sculpt25/source/blender/python/intern/bpy_util.c
    branches/sculpt25/source/blender/quicktime/CMakeLists.txt
    branches/sculpt25/source/blender/quicktime/SConscript
    branches/sculpt25/source/blender/quicktime/apple/qtkit_export.m
    branches/sculpt25/source/blender/quicktime/apple/qtkit_import.m
    branches/sculpt25/source/blender/quicktime/apple/quicktime_export.c
    branches/sculpt25/source/blender/quicktime/quicktime_export.h
    branches/sculpt25/source/blender/render/SConscript
    branches/sculpt25/source/blender/render/extern/include/RE_shader_ext.h
    branches/sculpt25/source/blender/render/intern/include/render_types.h
    branches/sculpt25/source/blender/render/intern/raytrace/reorganize.h
    branches/sculpt25/source/blender/render/intern/source/convertblender.c
    branches/sculpt25/source/blender/render/intern/source/occlusion.c
    branches/sculpt25/source/blender/render/intern/source/pipeline.c
    branches/sculpt25/source/blender/render/intern/source/pixelshading.c
    branches/sculpt25/source/blender/render/intern/source/shadeinput.c
    branches/sculpt25/source/blender/render/intern/source/shadeoutput.c
    branches/sculpt25/source/blender/render/intern/source/sss.c
    branches/sculpt25/source/blender/render/intern/source/strand.c
    branches/sculpt25/source/blender/render/intern/source/texture.c
    branches/sculpt25/source/blender/windowmanager/WM_api.h
    branches/sculpt25/source/blender/windowmanager/WM_types.h
    branches/sculpt25/source/blender/windowmanager/intern/wm_cursors.c
    branches/sculpt25/source/blender/windowmanager/intern/wm_draw.c
    branches/sculpt25/source/blender/windowmanager/intern/wm_event_system.c
    branches/sculpt25/source/blender/windowmanager/intern/wm_init_exit.c
    branches/sculpt25/source/blender/windowmanager/intern/wm_keymap.c
    branches/sculpt25/source/blender/windowmanager/intern/wm_operators.c
    branches/sculpt25/source/blender/windowmanager/intern/wm_window.c
    branches/sculpt25/source/blender/windowmanager/wm_event_system.h
    branches/sculpt25/source/blender/windowmanager/wm_window.h
    branches/sculpt25/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/sculpt25/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/sculpt25/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/sculpt25/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/sculpt25/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/sculpt25/source/gameengine/Ketsji/KX_RayCast.cpp
    branches/sculpt25/source/gameengine/Ketsji/KX_RayCast.h
    branches/sculpt25/source/gameengine/Ketsji/KX_Scene.cpp
    branches/sculpt25/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/sculpt25/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/sculpt25/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/sculpt25/source/gameengine/Physics/common/PHY_DynamicTypes.h
    branches/sculpt25/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/sculpt25/source/gameengine/PyDoc/GameTypes.py
    branches/sculpt25/tools/btools.py

Added Paths:
-----------
    branches/sculpt25/intern/ghost/intern/GHOST_DropTargetWin32.cpp
    branches/sculpt25/intern/ghost/intern/GHOST_DropTargetWin32.h
    branches/sculpt25/release/scripts/modules/graphviz_export.py
    branches/sculpt25/release/scripts/modules/retopo.py
    branches/sculpt25/release/scripts/modules/rigify/
    branches/sculpt25/release/scripts/modules/rigify/__init__.py
    branches/sculpt25/release/scripts/modules/rigify/arm.py
    branches/sculpt25/release/scripts/modules/rigify/delta.py
    branches/sculpt25/release/scripts/modules/rigify/finger.py
    branches/sculpt25/release/scripts/modules/rigify/leg.py
    branches/sculpt25/release/scripts/modules/rigify/neck.py
    branches/sculpt25/release/scripts/modules/rigify/palm.py
    branches/sculpt25/release/scripts/modules/rigify/spine.py
    branches/sculpt25/release/scripts/op/object.py
    branches/sculpt25/release/scripts/ui/space_graph.py
    branches/sculpt25/source/blender/makesrna/intern/rna_armature_api.c

Removed Paths:
-------------
    branches/sculpt25/release/scripts/modules/rigify/__init__.py
    branches/sculpt25/release/scripts/modules/rigify/arm.py
    branches/sculpt25/release/scripts/modules/rigify/delta.py
    branches/sculpt25/release/scripts/modules/rigify/finger.py
    branches/sculpt25/release/scripts/modules/rigify/leg.py
    branches/sculpt25/release/scripts/modules/rigify/neck.py
    branches/sculpt25/release/scripts/modules/rigify/palm.py
    branches/sculpt25/release/scripts/modules/rigify/spine.py
    branches/sculpt25/release/scripts/modules/rigify.py

Modified: branches/sculpt25/CMakeLists.txt
===================================================================
--- branches/sculpt25/CMakeLists.txt	2009-12-07 19:11:37 UTC (rev 25180)
+++ branches/sculpt25/CMakeLists.txt	2009-12-07 19:22:48 UTC (rev 25181)
@@ -1,4 +1,4 @@
-# $Id$
+ # $Id$
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
@@ -216,8 +216,8 @@
 
 	IF (WITH_OPENCOLLADA)
 		SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
-		SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
-		SET(OPENCOLLADA_LIB OpenCollada)
+		SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
+		SET(OPENCOLLADA_LIB OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre ftoa Buffer)
 		SET(OPENCOLLADA_INC ${OPENCOLLADA})
 		SET(PCRE /usr CACHE FILEPATH "PCRE Directory")
 		SET(PCRE_LIBPATH ${PCRE}/lib)
@@ -437,7 +437,7 @@
 		IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
 			SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.x.i386)
 		ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
-			SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc)
+			SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.0.0-powerpc)
 		ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
 	ENDIF(WITH_LIBS10.5)
 	
@@ -531,19 +531,21 @@
 	SET(LLIBS stdc++ SystemStubs)
 
 	IF (WITH_COCOA)
-	SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DGHOST_COCOA")
-	SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio")
-	IF(USE_QTKIT)
-	SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DUSE_QTKIT")
-	SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit")
-	ELSE(USE_QTKIT)
-	IF(WITH_QUICKTIME)
-	SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
-	ENDIF(WITH_QUICKTIME)
-	ENDIF(USE_QTKIT)
+		SET(PLATFORM_CFLAGS "-pipe -funsigned-char -DGHOST_COCOA")
+		SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio")
+		IF(USE_QTKIT)
+			SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DUSE_QTKIT")
+			SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit")
+			IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+				SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
+				#libSDL still needs 32bit carbon quicktime 
+			ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+		ELSEIF(WITH_QUICKTIME)
+			SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
+		ENDIF(USE_QTKIT)
 	ELSE (WITH_COCOA)
-	SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
-	SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
+		SET(PLATFORM_CFLAGS "-pipe -funsigned-char")
+		SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
 	ENDIF (WITH_COCOA)
 
 	IF(WITH_OPENMP)
@@ -585,13 +587,17 @@
 
 	SET(EXETYPE MACOSX_BUNDLE)
 
-
+	SET(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")
+	SET(CMAKE_CXX_FLAGS_DEBUG "-fno-strict-aliasing -g")
 	IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386")
-		SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller")
-		SET(CMAKE_C_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller")
+		SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -mdynamic-no-pic -ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller")
+		SET(CMAKE_C_FLAGS_RELEASE "-O3 -mdynamic-no-pic -ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller")
 	ELSEIF(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
-		SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller")
-		SET(CMAKE_C_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller")
+		SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -mdynamic-no-pic -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller")
+		SET(CMAKE_C_FLAGS_RELEASE "-O3 -mdynamic-no-pic -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller")
+	ELSE(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
+		SET(CMAKE_C_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
+		SET(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
 	ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386")
 
 	# Better warnings

Modified: branches/sculpt25/config/darwin-config.py
===================================================================
--- branches/sculpt25/config/darwin-config.py	2009-12-07 19:11:37 UTC (rev 25180)
+++ branches/sculpt25/config/darwin-config.py	2009-12-07 19:22:48 UTC (rev 25181)
@@ -40,11 +40,17 @@
 # Can be customized
 
 if MACOSX_ARCHITECTURE == 'ppc':
-	MAC_MIN_VERS = '10.3'
-	MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
-	LCGDIR = '#../lib/darwin-6.1-powerpc'
-	CC = 'gcc-3.3'
-	CXX = 'g++-3.3'
+# ppc release are now made for 10.4
+#	MAC_MIN_VERS = '10.3'
+#	MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
+#	LCGDIR = '#../lib/darwin-6.1-powerpc'
+#	CC = 'gcc-3.3'
+#	CXX = 'g++-3.3'
+	MAC_MIN_VERS = '10.4'
+	MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
+	LCGDIR = '#../lib/darwin-8.0.0-powerpc'
+	CC = 'gcc-4.0'
+	CXX = 'g++-4.0'
 elif MACOSX_ARCHITECTURE == 'i386':
 	MAC_MIN_VERS = '10.4'
 	MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
@@ -147,7 +153,7 @@
 BF_JACK_LIB = 'jack'
 BF_JACK_LIBPATH = '${BF_JACK}/lib'
 
-WITH_BF_SNDFILE = False
+WITH_BF_SNDFILE = True
 BF_SNDFILE = LIBDIR + '/sndfile'
 BF_SNDFILE_INC = '${BF_SNDFILE}/include'
 BF_SNDFILE_LIB = 'sndfile'
@@ -205,7 +211,7 @@
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-WITH_BF_FFTW3 = False
+WITH_BF_FFTW3 = True
 BF_FFTW3 = LIBDIR + '/fftw3'
 BF_FFTW3_INC = '${BF_FFTW3}/include'
 BF_FFTW3_LIB = 'libfftw3'
@@ -249,7 +255,7 @@
 BF_OPENGL_LINKFLAGS = ['-framework', 'OpenGL']
 
 #OpenCollada flags
-WITH_BF_COLLADA = True
+WITH_BF_COLLADA = False
 BF_COLLADA = '#source/blender/collada'
 BF_COLLADA_INC = '${BF_COLLADA}'
 BF_COLLADA_LIB = 'bf_collada'
@@ -303,8 +309,8 @@
 	LLIBS.append('crt3.o')
 	
 if USE_SDK==True:
-	SDK_FLAGS=['-isysroot', MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS]	
-	PLATFORM_LINKFLAGS = ['-mmacosx-version-min='+MAC_MIN_VERS,'-Wl','-syslibroot '+MACOSX_SDK]+PLATFORM_LINKFLAGS
+	SDK_FLAGS=['-isysroot', MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS,'-arch',MACOSX_ARCHITECTURE]	
+	PLATFORM_LINKFLAGS = ['-mmacosx-version-min='+MAC_MIN_VERS,'-Wl','-syslibroot '+MACOSX_SDK,'-arch',MACOSX_ARCHITECTURE]+PLATFORM_LINKFLAGS
 	CCFLAGS=SDK_FLAGS+CCFLAGS
 	CXXFLAGS=SDK_FLAGS+CXXFLAGS
 	

Modified: branches/sculpt25/config/linux2-config.py
===================================================================
--- branches/sculpt25/config/linux2-config.py	2009-12-07 19:11:37 UTC (rev 25180)
+++ branches/sculpt25/config/linux2-config.py	2009-12-07 19:22:48 UTC (rev 25181)
@@ -155,9 +155,9 @@
 BF_COLLADA = '#source/blender/collada'
 BF_COLLADA_INC = '${BF_COLLADA}'
 BF_COLLADA_LIB = 'bf_collada'
-BF_OPENCOLLADA = ''
-BF_OPENCOLLADA_LIB = 'OpenCollada'
-BF_OPENCOLLADA_LIBPATH = '/usr/lib'
+BF_OPENCOLLADA = '/usr'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre Buffer ftoa'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 BF_PCRE = ''
 BF_PCRE_LIB = 'pcre'
 BF_PCRE_LIBPATH = '/usr/lib'

Modified: branches/sculpt25/config/win32-mingw-config.py
===================================================================
--- branches/sculpt25/config/win32-mingw-config.py	2009-12-07 19:11:37 UTC (rev 25180)
+++ branches/sculpt25/config/win32-mingw-config.py	2009-12-07 19:22:48 UTC (rev 25181)
@@ -127,9 +127,16 @@
              '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
              '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
 
-# Disable Collada by default
-WITH_BF_COLLADA = False
+WITH_BF_COLLADA = True
+BF_COLLADA = '#source/blender/collada'
+BF_COLLADA_INC = '${BF_COLLADA}'
+BF_COLLADA_LIB = 'bf_collada'
 
+BF_OPENCOLLADA = LIBDIR + '/opencollada'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver xml2 pcre'
+BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
+
 ##
 CC = 'gcc'
 CXX = 'g++'
@@ -145,7 +152,7 @@
 
 CC_WARN = [ '-Wall' ]
 
-LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++']
+LLIBS = ['-lshell32', '-lshfolder', '-lgdi32', '-lmsvcrt', '-lwinmm', '-lmingw32', '-lm', '-lws2_32', '-lz', '-lstdc++','-lole32','-luuid']
 
 BF_DEBUG = False
 BF_DEBUG_CCFLAGS= ['-g']

Modified: branches/sculpt25/extern/Eigen2/Eigen/src/Core/util/Macros.h
===================================================================
--- branches/sculpt25/extern/Eigen2/Eigen/src/Core/util/Macros.h	2009-12-07 19:11:37 UTC (rev 25180)
+++ branches/sculpt25/extern/Eigen2/Eigen/src/Core/util/Macros.h	2009-12-07 19:22:48 UTC (rev 25181)
@@ -39,7 +39,7 @@
 // 16 byte alignment is only useful for vectorization. Since it affects the ABI, we need to enable 16 byte alignment on all
 // platforms where vectorization might be enabled. In theory we could always enable alignment, but it can be a cause of problems
 // on some platforms, so we just disable it in certain common platform (compiler+architecture combinations) to avoid these problems.
-#if defined(__GNUC__) && !(defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || defined(__ia64__))
+#if defined(__GNUC__) && !(defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || defined(__ia64__) || defined(__ppc__))
 #define EIGEN_GCC_AND_ARCH_DOESNT_WANT_ALIGNMENT 1
 #else
 #define EIGEN_GCC_AND_ARCH_DOESNT_WANT_ALIGNMENT 0


@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list