[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24485] branches/sculpt25: Sculpt: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r24330 :24483
Brecht Van Lommel
brecht at blender.org
Wed Nov 11 11:44:47 CET 2009
Revision: 24485
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24485
Author: blendix
Date: 2009-11-11 11:44:46 +0100 (Wed, 11 Nov 2009)
Log Message:
-----------
Sculpt: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r24330:24483
Modified Paths:
--------------
branches/sculpt25/CMakeLists.txt
branches/sculpt25/config/darwin-config.py
branches/sculpt25/extern/Makefile
branches/sculpt25/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
branches/sculpt25/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
branches/sculpt25/intern/bsp/SConscript
branches/sculpt25/intern/decimation/SConscript
branches/sculpt25/intern/ghost/GHOST_C-api.h
branches/sculpt25/intern/ghost/GHOST_ISystem.h
branches/sculpt25/intern/ghost/GHOST_Types.h
branches/sculpt25/intern/ghost/intern/GHOST_C-api.cpp
branches/sculpt25/intern/ghost/intern/GHOST_System.cpp
branches/sculpt25/intern/ghost/intern/GHOST_System.h
branches/sculpt25/intern/ghost/intern/GHOST_SystemCocoa.h
branches/sculpt25/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/sculpt25/intern/ghost/intern/GHOST_WindowCocoa.h
branches/sculpt25/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/sculpt25/intern/guardedalloc/MEM_guardedalloc.h
branches/sculpt25/intern/guardedalloc/intern/mallocn.c
branches/sculpt25/intern/smoke/intern/Makefile
branches/sculpt25/projectfiles_vc9/blender/blender.vcproj
branches/sculpt25/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/sculpt25/release/datafiles/datatoc.py
branches/sculpt25/release/scripts/io/netrender/client.py
branches/sculpt25/release/scripts/modules/bpy_ext/Object.py
branches/sculpt25/release/scripts/modules/bpy_ext/__init__.py
branches/sculpt25/release/scripts/modules/bpy_ops.py
branches/sculpt25/release/scripts/modules/bpy_utils.py
branches/sculpt25/release/scripts/modules/console/intellisense.py
branches/sculpt25/release/scripts/modules/dynamic_menu.py
branches/sculpt25/release/scripts/op/mesh_skin.py
branches/sculpt25/release/scripts/op/uvcalc_smart_project.py
branches/sculpt25/release/scripts/op/vertexpaint_dirt.py
branches/sculpt25/release/scripts/op/wm.py
branches/sculpt25/release/scripts/templates/gamelogic.py
branches/sculpt25/release/scripts/templates/gamelogic_basic.py
branches/sculpt25/release/scripts/templates/gamelogic_module.py
branches/sculpt25/release/scripts/templates/operator.py
branches/sculpt25/release/scripts/templates/operator_simple.py
branches/sculpt25/release/scripts/ui/properties_data_mesh.py
branches/sculpt25/release/scripts/ui/properties_object.py
branches/sculpt25/release/scripts/ui/properties_object_constraint.py
branches/sculpt25/release/scripts/ui/properties_physics_field.py
branches/sculpt25/release/scripts/ui/properties_physics_softbody.py
branches/sculpt25/release/scripts/ui/properties_render.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_sequencer.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/Makefile
branches/sculpt25/source/blender/blenfont/intern/blf_font.c
branches/sculpt25/source/blender/blenfont/intern/blf_glyph.c
branches/sculpt25/source/blender/blenkernel/BKE_cloth.h
branches/sculpt25/source/blender/blenkernel/BKE_constraint.h
branches/sculpt25/source/blender/blenkernel/BKE_context.h
branches/sculpt25/source/blender/blenkernel/BKE_node.h
branches/sculpt25/source/blender/blenkernel/intern/BME_tools.c
branches/sculpt25/source/blender/blenkernel/intern/DerivedMesh.c
branches/sculpt25/source/blender/blenkernel/intern/action.c
branches/sculpt25/source/blender/blenkernel/intern/anim.c
branches/sculpt25/source/blender/blenkernel/intern/anim_sys.c
branches/sculpt25/source/blender/blenkernel/intern/armature.c
branches/sculpt25/source/blender/blenkernel/intern/boids.c
branches/sculpt25/source/blender/blenkernel/intern/booleanops.c
branches/sculpt25/source/blender/blenkernel/intern/booleanops_mesh.c
branches/sculpt25/source/blender/blenkernel/intern/brush.c
branches/sculpt25/source/blender/blenkernel/intern/bvhutils.c
branches/sculpt25/source/blender/blenkernel/intern/cdderivedmesh.c
branches/sculpt25/source/blender/blenkernel/intern/cloth.c
branches/sculpt25/source/blender/blenkernel/intern/collision.c
branches/sculpt25/source/blender/blenkernel/intern/colortools.c
branches/sculpt25/source/blender/blenkernel/intern/constraint.c
branches/sculpt25/source/blender/blenkernel/intern/context.c
branches/sculpt25/source/blender/blenkernel/intern/curve.c
branches/sculpt25/source/blender/blenkernel/intern/customdata.c
branches/sculpt25/source/blender/blenkernel/intern/deform.c
branches/sculpt25/source/blender/blenkernel/intern/depsgraph.c
branches/sculpt25/source/blender/blenkernel/intern/displist.c
branches/sculpt25/source/blender/blenkernel/intern/effect.c
branches/sculpt25/source/blender/blenkernel/intern/exotic.c
branches/sculpt25/source/blender/blenkernel/intern/fcurve.c
branches/sculpt25/source/blender/blenkernel/intern/fluidsim.c
branches/sculpt25/source/blender/blenkernel/intern/fmodifier.c
branches/sculpt25/source/blender/blenkernel/intern/font.c
branches/sculpt25/source/blender/blenkernel/intern/gpencil.c
branches/sculpt25/source/blender/blenkernel/intern/image.c
branches/sculpt25/source/blender/blenkernel/intern/implicit.c
branches/sculpt25/source/blender/blenkernel/intern/ipo.c
branches/sculpt25/source/blender/blenkernel/intern/key.c
branches/sculpt25/source/blender/blenkernel/intern/lattice.c
branches/sculpt25/source/blender/blenkernel/intern/material.c
branches/sculpt25/source/blender/blenkernel/intern/mball.c
branches/sculpt25/source/blender/blenkernel/intern/mesh.c
branches/sculpt25/source/blender/blenkernel/intern/modifier.c
branches/sculpt25/source/blender/blenkernel/intern/multires.c
branches/sculpt25/source/blender/blenkernel/intern/node.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/seqeffects.c
branches/sculpt25/source/blender/blenkernel/intern/sequence.c
branches/sculpt25/source/blender/blenkernel/intern/shrinkwrap.c
branches/sculpt25/source/blender/blenkernel/intern/simple_deform.c
branches/sculpt25/source/blender/blenkernel/intern/sketch.c
branches/sculpt25/source/blender/blenkernel/intern/smoke.c
branches/sculpt25/source/blender/blenkernel/intern/softbody.c
branches/sculpt25/source/blender/blenkernel/intern/subsurf_ccg.c
branches/sculpt25/source/blender/blenkernel/intern/texture.c
branches/sculpt25/source/blender/blenkernel/intern/world.c
branches/sculpt25/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/sculpt25/source/blender/blenlib/intern/BLI_kdtree.c
branches/sculpt25/source/blender/blenlib/intern/freetypefont.c
branches/sculpt25/source/blender/blenlib/intern/graph.c
branches/sculpt25/source/blender/blenlib/intern/jitter.c
branches/sculpt25/source/blender/blenlib/intern/pbvh.c
branches/sculpt25/source/blender/blenlib/intern/scanfill.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/CMakeLists.txt
branches/sculpt25/source/blender/collada/DocumentExporter.cpp
branches/sculpt25/source/blender/collada/DocumentImporter.cpp
branches/sculpt25/source/blender/collada/SConscript
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_draw.c
branches/sculpt25/source/blender/editors/animation/anim_filter.c
branches/sculpt25/source/blender/editors/animation/anim_ipo_utils.c
branches/sculpt25/source/blender/editors/animation/anim_markers.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/editarmature_generate.c
branches/sculpt25/source/blender/editors/armature/editarmature_retarget.c
branches/sculpt25/source/blender/editors/armature/editarmature_sketch.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/poselib.c
branches/sculpt25/source/blender/editors/armature/poseobject.c
branches/sculpt25/source/blender/editors/armature/reeb.c
branches/sculpt25/source/blender/editors/curve/curve_ops.c
branches/sculpt25/source/blender/editors/curve/editcurve.c
branches/sculpt25/source/blender/editors/curve/editfont.c
branches/sculpt25/source/blender/editors/datafiles/B.blend.c
branches/sculpt25/source/blender/editors/gpencil/drawgpencil.c
branches/sculpt25/source/blender/editors/gpencil/editaction_gpencil.c
branches/sculpt25/source/blender/editors/gpencil/gpencil_buttons.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_gpencil.h
branches/sculpt25/source/blender/editors/include/ED_object.h
branches/sculpt25/source/blender/editors/include/ED_transform.h
branches/sculpt25/source/blender/editors/include/UI_icons.h
branches/sculpt25/source/blender/editors/interface/interface.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_icons.c
branches/sculpt25/source/blender/editors/interface/interface_layout.c
branches/sculpt25/source/blender/editors/interface/interface_panel.c
branches/sculpt25/source/blender/editors/interface/interface_regions.c
branches/sculpt25/source/blender/editors/interface/interface_style.c
branches/sculpt25/source/blender/editors/interface/interface_templates.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_add.c
branches/sculpt25/source/blender/editors/mesh/editmesh_lib.c
branches/sculpt25/source/blender/editors/mesh/editmesh_loop.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/mesh_data.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/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_hook.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_shapekey.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/render/render_preview.c
branches/sculpt25/source/blender/editors/render/render_shading.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_image.c
branches/sculpt25/source/blender/editors/sculpt_paint/paint_stroke.c
branches/sculpt25/source/blender/editors/sculpt_paint/paint_utils.c
branches/sculpt25/source/blender/editors/sculpt_paint/paint_vertex.c
branches/sculpt25/source/blender/editors/sculpt_paint/sculpt.c
branches/sculpt25/source/blender/editors/space_action/action_draw.c
branches/sculpt25/source/blender/editors/space_action/action_edit.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_api/space.c
branches/sculpt25/source/blender/editors/space_buttons/buttons_context.c
branches/sculpt25/source/blender/editors/space_buttons/space_buttons.c
branches/sculpt25/source/blender/editors/space_console/console_report.c
branches/sculpt25/source/blender/editors/space_console/space_console.c
branches/sculpt25/source/blender/editors/space_file/file_ops.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_select.c
branches/sculpt25/source/blender/editors/space_graph/graph_utils.c
branches/sculpt25/source/blender/editors/space_graph/space_graph.c
branches/sculpt25/source/blender/editors/space_image/image_buttons.c
branches/sculpt25/source/blender/editors/space_image/image_ops.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_buttons.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_draw.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_ops.c
branches/sculpt25/source/blender/editors/space_nla/nla_select.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/node_draw.c
branches/sculpt25/source/blender/editors/space_node/node_edit.c
branches/sculpt25/source/blender/editors/space_node/node_intern.h
branches/sculpt25/source/blender/editors/space_node/node_ops.c
branches/sculpt25/source/blender/editors/space_node/node_select.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/space_outliner.c
branches/sculpt25/source/blender/editors/space_script/script_ops.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_edit.c
branches/sculpt25/source/blender/editors/space_sequencer/sequencer_intern.h
branches/sculpt25/source/blender/editors/space_sequencer/sequencer_ops.c
branches/sculpt25/source/blender/editors/space_sequencer/sequencer_select.c
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_view3d/drawarmature.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/drawvolume.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_snap.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_input.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/util/editmode_undo.c
branches/sculpt25/source/blender/editors/uvedit/uvedit_draw.c
branches/sculpt25/source/blender/editors/uvedit/uvedit_ops.c
branches/sculpt25/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/sculpt25/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/sculpt25/source/blender/gpu/intern/gpu_buffers.c
branches/sculpt25/source/blender/gpu/intern/gpu_material.c
branches/sculpt25/source/blender/gpu/intern/gpu_shader_material.glsl
branches/sculpt25/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/sculpt25/source/blender/ikplugin/intern/ikplugin_api.c
branches/sculpt25/source/blender/ikplugin/intern/iksolver_plugin.c
branches/sculpt25/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/sculpt25/source/blender/imbuf/intern/Makefile
branches/sculpt25/source/blender/makesdna/DNA_action_types.h
branches/sculpt25/source/blender/makesdna/DNA_armature_types.h
branches/sculpt25/source/blender/makesdna/DNA_constraint_types.h
branches/sculpt25/source/blender/makesdna/DNA_modifier_types.h
branches/sculpt25/source/blender/makesdna/DNA_node_types.h
branches/sculpt25/source/blender/makesdna/DNA_scene_types.h
branches/sculpt25/source/blender/makesdna/DNA_space_types.h
branches/sculpt25/source/blender/makesrna/RNA_access.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_armature.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_internal.h
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_meta.c
branches/sculpt25/source/blender/makesrna/intern/rna_modifier.c
branches/sculpt25/source/blender/makesrna/intern/rna_nodetree.c
branches/sculpt25/source/blender/makesrna/intern/rna_nodetree_types.h
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_scene.c
branches/sculpt25/source/blender/makesrna/intern/rna_space.c
branches/sculpt25/source/blender/makesrna/intern/rna_userdef.c
branches/sculpt25/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
branches/sculpt25/source/blender/nodes/intern/CMP_util.h
branches/sculpt25/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
branches/sculpt25/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
branches/sculpt25/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
branches/sculpt25/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/sculpt25/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
branches/sculpt25/source/blender/nodes/intern/SHD_util.h
branches/sculpt25/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
branches/sculpt25/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
branches/sculpt25/source/blender/nodes/intern/TEX_util.h
branches/sculpt25/source/blender/python/BPY_extern.h
branches/sculpt25/source/blender/python/generic/Geometry.c
branches/sculpt25/source/blender/python/generic/Mathutils.c
branches/sculpt25/source/blender/python/generic/euler.c
branches/sculpt25/source/blender/python/generic/matrix.c
branches/sculpt25/source/blender/python/generic/quat.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_wrap.c
branches/sculpt25/source/blender/python/intern/bpy_rna.c
branches/sculpt25/source/blender/python/intern/bpy_rna.h
branches/sculpt25/source/blender/python/intern/bpy_util.c
branches/sculpt25/source/blender/quicktime/apple/quicktime_export.c
branches/sculpt25/source/blender/quicktime/quicktime_export.h
branches/sculpt25/source/blender/render/CMakeLists.txt
branches/sculpt25/source/blender/render/SConscript
branches/sculpt25/source/blender/render/intern/raytrace/rayobject.cpp
branches/sculpt25/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
branches/sculpt25/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
branches/sculpt25/source/blender/render/intern/source/convertblender.c
branches/sculpt25/source/blender/render/intern/source/envmap.c
branches/sculpt25/source/blender/render/intern/source/imagetexture.c
branches/sculpt25/source/blender/render/intern/source/initrender.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/pixelblending.c
branches/sculpt25/source/blender/render/intern/source/pixelshading.c
branches/sculpt25/source/blender/render/intern/source/pointdensity.c
branches/sculpt25/source/blender/render/intern/source/rayobject_blibvh.c
branches/sculpt25/source/blender/render/intern/source/rayobject_instance.c
branches/sculpt25/source/blender/render/intern/source/rayobject_octree.c
branches/sculpt25/source/blender/render/intern/source/rayshade.c
branches/sculpt25/source/blender/render/intern/source/rendercore.c
branches/sculpt25/source/blender/render/intern/source/renderdatabase.c
branches/sculpt25/source/blender/render/intern/source/shadbuf.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/sunsky.c
branches/sculpt25/source/blender/render/intern/source/texture.c
branches/sculpt25/source/blender/render/intern/source/volume_precache.c
branches/sculpt25/source/blender/render/intern/source/volumetric.c
branches/sculpt25/source/blender/render/intern/source/voxeldata.c
branches/sculpt25/source/blender/render/intern/source/zbuf.c
branches/sculpt25/source/blender/windowmanager/WM_api.h
branches/sculpt25/source/blender/windowmanager/WM_types.h
branches/sculpt25/source/blender/windowmanager/intern/wm.c
branches/sculpt25/source/blender/windowmanager/intern/wm_event_system.c
branches/sculpt25/source/blender/windowmanager/intern/wm_files.c
branches/sculpt25/source/blender/windowmanager/intern/wm_gesture.c
branches/sculpt25/source/blender/windowmanager/intern/wm_init_exit.c
branches/sculpt25/source/blender/windowmanager/intern/wm_operators.c
branches/sculpt25/source/blender/windowmanager/intern/wm_subwindow.c
branches/sculpt25/source/blender/windowmanager/intern/wm_window.c
branches/sculpt25/source/blender/windowmanager/wm.h
branches/sculpt25/source/blender/windowmanager/wm_event_types.h
branches/sculpt25/source/creator/CMakeLists.txt
branches/sculpt25/source/creator/creator.c
branches/sculpt25/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/sculpt25/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/sculpt25/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/sculpt25/source/gameengine/BlenderRoutines/KX_BlenderGL.h
branches/sculpt25/source/gameengine/Converter/BL_ActionActuator.cpp
branches/sculpt25/source/gameengine/Converter/BL_ArmatureActuator.cpp
branches/sculpt25/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/sculpt25/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/sculpt25/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/sculpt25/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/sculpt25/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/sculpt25/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/sculpt25/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/sculpt25/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/sculpt25/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/sculpt25/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/sculpt25/source/gameengine/GameLogic/SCA_ExpressionController.cpp
branches/sculpt25/source/gameengine/Ketsji/KX_Dome.cpp
branches/sculpt25/source/gameengine/Ketsji/KX_GameObject.cpp
branches/sculpt25/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/sculpt25/source/gameengine/VideoTexture/ImageRender.cpp
branches/sculpt25/source/nan_definitions.mk
branches/sculpt25/source/nan_link.mk
Added Paths:
-----------
branches/sculpt25/intern/ghost/intern/GHOST_EventDragnDrop.h
branches/sculpt25/release/scripts/modules/bpy_ext/Mesh.py
branches/sculpt25/release/scripts/modules/bpy_types.py
branches/sculpt25/release/scripts/modules/console/complete_calltip.py
branches/sculpt25/release/scripts/op/console_python.py
branches/sculpt25/release/scripts/op/console_shell.py
branches/sculpt25/release/scripts/op/mesh.py
branches/sculpt25/source/blender/blenlib/BLI_math.h
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_math_matrix.h
branches/sculpt25/source/blender/blenlib/BLI_math_rotation.h
branches/sculpt25/source/blender/blenlib/BLI_math_vector.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/math_matrix.c
branches/sculpt25/source/blender/blenlib/intern/math_rotation.c
branches/sculpt25/source/blender/blenlib/intern/math_vector.c
branches/sculpt25/source/blender/blenlib/intern/math_vector_inline.c
branches/sculpt25/source/blender/editors/space_node/node_buttons.c
branches/sculpt25/source/blender/makesrna/intern/rna_fcurve_api.c
Removed Paths:
-------------
branches/sculpt25/source/blender/blenlib/BLI_arithb.h
branches/sculpt25/source/blender/blenlib/intern/arithb.c
Modified: branches/sculpt25/CMakeLists.txt
===================================================================
--- branches/sculpt25/CMakeLists.txt 2009-11-11 10:27:25 UTC (rev 24484)
+++ branches/sculpt25/CMakeLists.txt 2009-11-11 10:44:46 UTC (rev 24485)
@@ -91,18 +91,6 @@
MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
-IF (WITH_OPENCOLLADA AND NOT APPLE)
-SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
-SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
-SET(OPENCOLLADA_LIB OpenCollada)
-SET(PCRE /usr CACHE FILEPATH "PCRE Directory")
-SET(PCRE_LIBPATH ${PCRE}/lib)
-SET(PCRE_LIB pcre)
-SET(EXPAT /usr CACHE FILEPATH "Expat Directory")
-SET(EXPAT_LIBPATH ${EXPAT}/lib)
-SET(EXPAT_LIB expat)
-ENDIF (WITH_OPENCOLLADA AND NOT APPLE)
-
# For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
# On Unix:
# cmake -D PYTHON_LIB=/usr/local/lib/python2.3/config/libpython2.3.so -D PYTHON_INC=/usr/local/include/python2.3 -D PYTHON_BINARY=/usr/local/bin/python2.3 -G "Unix Makefiles" ../blender
@@ -119,6 +107,8 @@
#Platform specifics
IF(UNIX AND NOT APPLE)
+
+
IF(WITH_OPENAL)
FIND_PACKAGE(OpenAL)
IF(OPENAL_FOUND)
@@ -217,6 +207,20 @@
FIND_PACKAGE(ZLIB REQUIRED)
+ IF (WITH_OPENCOLLADA)
+ SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
+ SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
+ SET(OPENCOLLADA_LIB OpenCollada)
+ SET(OPENCOLLADA_INC ${OPENCOLLADA})
+ SET(PCRE /usr CACHE FILEPATH "PCRE Directory")
+ SET(PCRE_LIBPATH ${PCRE}/lib)
+ SET(PCRE_LIB pcre)
+ SET(EXPAT /usr CACHE FILEPATH "Expat Directory")
+ SET(EXPAT_LIBPATH ${EXPAT}/lib)
+ SET(EXPAT_LIB expat)
+ ENDIF (WITH_OPENCOLLADA)
+
+
# Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
@@ -400,6 +404,16 @@
SET(WINTAB_INC ${LIBDIR}/wintab/include)
+ SET(OPENCOLLADA ${LIBDIR}/opencollada)
+ SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
+ SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
+ SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2 )
+ #pcre is bundled with openCollada
+ #SET(PCRE ${LIBDIR}/pcre)
+ #SET(PCRE_LIBPATH ${PCRE}/lib)
+ SET(PCRE_LIB pcre)
+
+
IF(CMAKE_CL_64)
SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
ELSE(CMAKE_CL_64)
@@ -532,10 +546,10 @@
#SET(PCRE ${LIBDIR}/pcre)
#SET(PCRE_LIBPATH ${PCRE}/lib)
SET(PCRE_LIB pcre)
- #native OSX libxml2 is used
+ #libxml2 is used
#SET(EXPAT ${LIBDIR}/expat)
#SET(EXPAT_LIBPATH ${EXPAT}/lib)
- #SET(EXPAT_LIB expat)
+ SET(EXPAT_LIB)
ENDIF (WITH_OPENCOLLADA)
SET(SDL ${LIBDIR}/sdl)
Modified: branches/sculpt25/config/darwin-config.py
===================================================================
--- branches/sculpt25/config/darwin-config.py 2009-11-11 10:27:25 UTC (rev 24484)
+++ branches/sculpt25/config/darwin-config.py 2009-11-11 10:44:46 UTC (rev 24485)
@@ -31,7 +31,7 @@
elif cmd_res[0]=='10':
MAC_CUR_VER='10.6'
-if MAC_PROC == 'powerpc':
+if MACOSX_ARCHITECTURE == 'ppc':
LCGDIR = '#../lib/darwin-6.1-powerpc'
else :
LCGDIR = '#../lib/darwin-9.x.universal'
@@ -39,7 +39,7 @@
BF_PYTHON_VERSION = '3.1'
-if MAC_PROC == 'powerpc' and BF_PYTHON_VERSION == '2.3':
+if MACOSX_ARCHITECTURE == 'ppc' and BF_PYTHON_VERSION == '2.3':
MAC_MIN_VERS = '10.3'
MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
CC = 'gcc'
@@ -247,7 +247,20 @@
BF_OPENGL_LINKFLAGS = ['-framework', 'OpenGL']
#OpenCollada flags
-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 = 'OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2'
+BF_OPENCOLLADA_LIBPATH = LIBDIR + '/opencollada'
+BF_PCRE = LIBDIR + '/opencollada'
+BF_PCRE_LIB = 'pcre'
+BF_PCRE_LIBPATH = '${BF_PCRE}/lib'
+#BF_EXPAT = '/usr'
+#BF_EXPAT_LIB = 'expat'
+#BF_EXPAT_LIBPATH = '/usr/lib'
#############################################################################
################### various compile settings and flags ##################
Modified: branches/sculpt25/extern/Makefile
===================================================================
--- branches/sculpt25/extern/Makefile 2009-11-11 10:27:25 UTC (rev 24484)
+++ branches/sculpt25/extern/Makefile 2009-11-11 10:44:46 UTC (rev 24485)
@@ -34,7 +34,7 @@
# Cloth requires it
ifeq ($(NAN_USE_BULLET), true)
- DIRS += bullet2
+ DIRS += bullet2
endif
ifeq ($(WITH_BINRELOC), true)
@@ -42,7 +42,9 @@
endif
ifeq ($(WITH_OPENJPEG), true)
- DIRS += libopenjpeg
+ ifndef BF_OPENJPEG
+ DIRS += libopenjpeg
+ endif
endif
ifeq ($(WITH_LZO), true)
Modified: branches/sculpt25/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
===================================================================
--- branches/sculpt25/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp 2009-11-11 10:27:25 UTC (rev 24484)
+++ branches/sculpt25/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp 2009-11-11 10:44:46 UTC (rev 24485)
@@ -202,7 +202,6 @@
input.m_maximumDistanceSquared*= input.m_maximumDistanceSquared;
}
- input.m_stackAlloc = dispatchInfo.m_stackAllocator;
input.m_transformA = body0->getWorldTransform();
input.m_transformB = body1->getWorldTransform();
Modified: branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
===================================================================
--- branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h 2009-11-11 10:27:25 UTC (rev 24484)
+++ branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h 2009-11-11 10:44:46 UTC (rev 24485)
@@ -33,7 +33,7 @@
const btConvexShape* convexA,const btConvexShape* convexB,
const btTransform& transA,const btTransform& transB,
btVector3& v, btVector3& pa, btVector3& pb,
- class btIDebugDraw* debugDraw,btStackAlloc* stackAlloc
+ class btIDebugDraw* debugDraw
) = 0;
Modified: branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
===================================================================
--- branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h 2009-11-11 10:27:25 UTC (rev 24484)
+++ branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h 2009-11-11 10:44:46 UTC (rev 24485)
@@ -41,15 +41,13 @@
struct ClosestPointInput
{
ClosestPointInput()
- :m_maximumDistanceSquared(btScalar(1e30)),
- m_stackAlloc(0)
+ :m_maximumDistanceSquared(btScalar(1e30))
{
}
btTransform m_transformA;
btTransform m_transformB;
btScalar m_maximumDistanceSquared;
- btStackAlloc* m_stackAlloc;
};
virtual ~btDiscreteCollisionDetectorInterface() {};
Modified: branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
===================================================================
--- branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp 2009-11-11 10:27:25 UTC (rev 24484)
+++ branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp 2009-11-11 10:44:46 UTC (rev 24485)
@@ -25,7 +25,7 @@
const btConvexShape* pConvexA, const btConvexShape* pConvexB,
const btTransform& transformA, const btTransform& transformB,
btVector3& v, btVector3& wWitnessOnA, btVector3& wWitnessOnB,
- class btIDebugDraw* debugDraw, btStackAlloc* stackAlloc )
+ class btIDebugDraw* debugDraw )
{
(void)debugDraw;
Modified: branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
===================================================================
--- branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h 2009-11-11 10:27:25 UTC (rev 24484)
+++ branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h 2009-11-11 10:44:46 UTC (rev 24485)
@@ -29,7 +29,7 @@
const btConvexShape* pConvexA, const btConvexShape* pConvexB,
const btTransform& transformA, const btTransform& transformB,
btVector3& v, btVector3& wWitnessOnA, btVector3& wWitnessOnB,
- class btIDebugDraw* debugDraw,btStackAlloc* stackAlloc );
+ class btIDebugDraw* debugDraw );
private :
Modified: branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
===================================================================
--- branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp 2009-11-11 10:27:25 UTC (rev 24484)
+++ branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp 2009-11-11 10:44:46 UTC (rev 24485)
@@ -293,7 +293,7 @@
m_minkowskiA,m_minkowskiB,
localTransA,localTransB,
m_cachedSeparatingAxis, tmpPointOnA, tmpPointOnB,
- debugDraw,input.m_stackAlloc
+ debugDraw
);
if (isValid2)
Modified: branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
===================================================================
--- branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp 2009-11-11 10:27:25 UTC (rev 24484)
+++ branches/sculpt25/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp 2009-11-11 10:44:46 UTC (rev 24485)
@@ -71,11 +71,10 @@
const btConvexShape* convexA,const btConvexShape* convexB,
const btTransform& transA,const btTransform& transB,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list