[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24893] branches/sculpt25: Sculpt:
Brecht Van Lommel
brecht at blender.org
Wed Nov 25 18:52:33 CET 2009
Revision: 24893
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24893
Author: blendix
Date: 2009-11-25 18:51:16 +0100 (Wed, 25 Nov 2009)
Log Message:
-----------
Sculpt:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r24483:24889
Modified Paths:
--------------
branches/sculpt25/CMakeLists.txt
branches/sculpt25/SConstruct
branches/sculpt25/config/darwin-config.py
branches/sculpt25/config/irix6-config.py
branches/sculpt25/config/linux2-config.py
branches/sculpt25/config/linuxcross-config.py
branches/sculpt25/config/sunos5-config.py
branches/sculpt25/config/win32-mingw-config.py
branches/sculpt25/extern/glew/CMakeLists.txt
branches/sculpt25/extern/glew/SConscript
branches/sculpt25/extern/glew/include/GL/glew.h
branches/sculpt25/extern/glew/include/GL/glxew.h
branches/sculpt25/extern/glew/include/GL/wglew.h
branches/sculpt25/extern/glew/make/msvc_9_0/glew.vcproj
branches/sculpt25/extern/glew/src/glew.c
branches/sculpt25/intern/audaspace/make/msvc_9_0/audaspace.vcproj
branches/sculpt25/intern/ghost/GHOST_C-api.h
branches/sculpt25/intern/ghost/GHOST_ISystem.h
branches/sculpt25/intern/ghost/GHOST_IWindow.h
branches/sculpt25/intern/ghost/intern/GHOST_C-api.cpp
branches/sculpt25/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
branches/sculpt25/intern/ghost/intern/GHOST_EventDragnDrop.h
branches/sculpt25/intern/ghost/intern/GHOST_EventPrinter.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_SystemX11.cpp
branches/sculpt25/intern/ghost/intern/GHOST_SystemX11.h
branches/sculpt25/intern/ghost/intern/GHOST_Window.cpp
branches/sculpt25/intern/ghost/intern/GHOST_Window.h
branches/sculpt25/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/sculpt25/intern/ghost/make/msvc_9_0/ghost.vcproj
branches/sculpt25/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
branches/sculpt25/projectfiles_vc9/blender/blender.sln
branches/sculpt25/projectfiles_vc9/blender/blender.vcproj
branches/sculpt25/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
branches/sculpt25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
branches/sculpt25/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/sculpt25/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
branches/sculpt25/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
branches/sculpt25/projectfiles_vc9/blender/windowmanager/windowmanager.vcproj
branches/sculpt25/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
branches/sculpt25/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
branches/sculpt25/projectfiles_vc9/gameengine/gameplayer/common/GP_common.vcproj
branches/sculpt25/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
branches/sculpt25/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
branches/sculpt25/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
branches/sculpt25/projectfiles_vc9/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
branches/sculpt25/release/VERSION
branches/sculpt25/release/datafiles/splash.png
branches/sculpt25/release/scripts/io/engine_render_pov.py
branches/sculpt25/release/scripts/io/export_3ds.py
branches/sculpt25/release/scripts/io/export_fbx.py
branches/sculpt25/release/scripts/io/export_mdd.py
branches/sculpt25/release/scripts/io/export_obj.py
branches/sculpt25/release/scripts/io/export_ply.py
branches/sculpt25/release/scripts/io/export_x3d.py
branches/sculpt25/release/scripts/io/import_anim_bvh.py
branches/sculpt25/release/scripts/io/import_scene_3ds.py
branches/sculpt25/release/scripts/io/import_scene_obj.py
branches/sculpt25/release/scripts/io/netrender/__init__.py
branches/sculpt25/release/scripts/io/netrender/client.py
branches/sculpt25/release/scripts/io/netrender/operators.py
branches/sculpt25/release/scripts/io/netrender/slave.py
branches/sculpt25/release/scripts/io/netrender/ui.py
branches/sculpt25/release/scripts/io/netrender/utils.py
branches/sculpt25/release/scripts/modules/bpy_types.py
branches/sculpt25/release/scripts/modules/dynamic_menu.py
branches/sculpt25/release/scripts/op/add_mesh_torus.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/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_armature.py
branches/sculpt25/release/scripts/ui/properties_data_bone.py
branches/sculpt25/release/scripts/ui/properties_data_camera.py
branches/sculpt25/release/scripts/ui/properties_data_curve.py
branches/sculpt25/release/scripts/ui/properties_data_empty.py
branches/sculpt25/release/scripts/ui/properties_data_lamp.py
branches/sculpt25/release/scripts/ui/properties_data_lattice.py
branches/sculpt25/release/scripts/ui/properties_data_mesh.py
branches/sculpt25/release/scripts/ui/properties_data_metaball.py
branches/sculpt25/release/scripts/ui/properties_data_modifier.py
branches/sculpt25/release/scripts/ui/properties_game.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_physics_field.py
branches/sculpt25/release/scripts/ui/properties_physics_fluid.py
branches/sculpt25/release/scripts/ui/properties_physics_smoke.py
branches/sculpt25/release/scripts/ui/properties_physics_softbody.py
branches/sculpt25/release/scripts/ui/properties_render.py
branches/sculpt25/release/scripts/ui/properties_scene.py
branches/sculpt25/release/scripts/ui/properties_texture.py
branches/sculpt25/release/scripts/ui/properties_world.py
branches/sculpt25/release/scripts/ui/space_buttons.py
branches/sculpt25/release/scripts/ui/space_console.py
branches/sculpt25/release/scripts/ui/space_filebrowser.py
branches/sculpt25/release/scripts/ui/space_image.py
branches/sculpt25/release/scripts/ui/space_info.py
branches/sculpt25/release/scripts/ui/space_logic.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_DerivedMesh.h
branches/sculpt25/source/blender/blenkernel/BKE_action.h
branches/sculpt25/source/blender/blenkernel/BKE_constraint.h
branches/sculpt25/source/blender/blenkernel/BKE_context.h
branches/sculpt25/source/blender/blenkernel/BKE_fcurve.h
branches/sculpt25/source/blender/blenkernel/BKE_group.h
branches/sculpt25/source/blender/blenkernel/BKE_idprop.h
branches/sculpt25/source/blender/blenkernel/BKE_key.h
branches/sculpt25/source/blender/blenkernel/BKE_modifier.h
branches/sculpt25/source/blender/blenkernel/BKE_paint.h
branches/sculpt25/source/blender/blenkernel/BKE_sequence.h
branches/sculpt25/source/blender/blenkernel/BKE_softbody.h
branches/sculpt25/source/blender/blenkernel/CMakeLists.txt
branches/sculpt25/source/blender/blenkernel/SConscript
branches/sculpt25/source/blender/blenkernel/intern/CCGSubSurf.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/brush.c
branches/sculpt25/source/blender/blenkernel/intern/cloth.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/depsgraph.c
branches/sculpt25/source/blender/blenkernel/intern/fcurve.c
branches/sculpt25/source/blender/blenkernel/intern/fmodifier.c
branches/sculpt25/source/blender/blenkernel/intern/group.c
branches/sculpt25/source/blender/blenkernel/intern/idprop.c
branches/sculpt25/source/blender/blenkernel/intern/ipo.c
branches/sculpt25/source/blender/blenkernel/intern/key.c
branches/sculpt25/source/blender/blenkernel/intern/modifier.c
branches/sculpt25/source/blender/blenkernel/intern/node.c
branches/sculpt25/source/blender/blenkernel/intern/object.c
branches/sculpt25/source/blender/blenkernel/intern/paint.c
branches/sculpt25/source/blender/blenkernel/intern/seqeffects.c
branches/sculpt25/source/blender/blenkernel/intern/sequence.c
branches/sculpt25/source/blender/blenkernel/intern/softbody.c
branches/sculpt25/source/blender/blenkernel/intern/sound.c
branches/sculpt25/source/blender/blenkernel/intern/text.c
branches/sculpt25/source/blender/blenlib/BLI_dlrbTree.h
branches/sculpt25/source/blender/blenlib/BLI_listbase.h
branches/sculpt25/source/blender/blenlib/BLI_math_vector.h
branches/sculpt25/source/blender/blenlib/intern/BLI_bfile.c
branches/sculpt25/source/blender/blenlib/intern/DLRB_tree.c
branches/sculpt25/source/blender/blenlib/intern/boxpack2d.c
branches/sculpt25/source/blender/blenlib/intern/listbase.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_vector.c
branches/sculpt25/source/blender/blenloader/intern/readfile.c
branches/sculpt25/source/blender/collada/DocumentImporter.cpp
branches/sculpt25/source/blender/editors/CMakeLists.txt
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_deps.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_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/keyframing.c
branches/sculpt25/source/blender/editors/animation/keyingsets.c
branches/sculpt25/source/blender/editors/armature/SConscript
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_sketch.c
branches/sculpt25/source/blender/editors/armature/poseSlide.c
branches/sculpt25/source/blender/editors/armature/poseobject.c
branches/sculpt25/source/blender/editors/curve/SConscript
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/datafiles/prvicons.c
branches/sculpt25/source/blender/editors/datafiles/splash.png.c
branches/sculpt25/source/blender/editors/gpencil/SConscript
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_keyframes_draw.h
branches/sculpt25/source/blender/editors/include/ED_mball.h
branches/sculpt25/source/blender/editors/include/ED_mesh.h
branches/sculpt25/source/blender/editors/include/ED_node.h
branches/sculpt25/source/blender/editors/include/ED_object.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_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/interface/view2d_ops.c
branches/sculpt25/source/blender/editors/mesh/SConscript
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_ops.c
branches/sculpt25/source/blender/editors/metaball/SConscript
branches/sculpt25/source/blender/editors/metaball/mball_edit.c
branches/sculpt25/source/blender/editors/object/SConscript
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_group.c
branches/sculpt25/source/blender/editors/object/object_hook.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_shapekey.c
branches/sculpt25/source/blender/editors/object/object_transform.c
branches/sculpt25/source/blender/editors/object/object_vgroup.c
branches/sculpt25/source/blender/editors/physics/SConscript
branches/sculpt25/source/blender/editors/physics/physics_ops.c
branches/sculpt25/source/blender/editors/render/SConscript
branches/sculpt25/source/blender/editors/screen/area.c
branches/sculpt25/source/blender/editors/screen/screen_context.c
branches/sculpt25/source/blender/editors/screen/screen_ops.c
branches/sculpt25/source/blender/editors/sculpt_paint/SConscript
branches/sculpt25/source/blender/editors/sculpt_paint/paint_image.c
branches/sculpt25/source/blender/editors/sculpt_paint/paint_ops.c
branches/sculpt25/source/blender/editors/sculpt_paint/paint_stroke.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/sound/SConscript
branches/sculpt25/source/blender/editors/space_api/spacetypes.c
branches/sculpt25/source/blender/editors/space_file/file_ops.c
branches/sculpt25/source/blender/editors/space_file/filelist.c
branches/sculpt25/source/blender/editors/space_file/filesel.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_image/image_ops.c
branches/sculpt25/source/blender/editors/space_nla/nla_buttons.c
branches/sculpt25/source/blender/editors/space_node/drawnode.c
branches/sculpt25/source/blender/editors/space_node/node_buttons.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_header.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/node_state.c
branches/sculpt25/source/blender/editors/space_node/space_node.c
branches/sculpt25/source/blender/editors/space_script/script_edit.c
branches/sculpt25/source/blender/editors/space_script/script_intern.h
branches/sculpt25/source/blender/editors/space_script/script_ops.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_text/text_ops.c
branches/sculpt25/source/blender/editors/space_view3d/SConscript
branches/sculpt25/source/blender/editors/space_view3d/drawarmature.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_intern.h
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_view.c
branches/sculpt25/source/blender/editors/transform/SConscript
branches/sculpt25/source/blender/editors/transform/transform.c
branches/sculpt25/source/blender/editors/transform/transform.h
branches/sculpt25/source/blender/editors/transform/transform_conversions.c
branches/sculpt25/source/blender/editors/transform/transform_input.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/gpu/CMakeLists.txt
branches/sculpt25/source/blender/gpu/SConscript
branches/sculpt25/source/blender/imbuf/intern/jp2.c
branches/sculpt25/source/blender/imbuf/intern/util.c
branches/sculpt25/source/blender/makesdna/DNA_anim_types.h
branches/sculpt25/source/blender/makesdna/DNA_cloth_types.h
branches/sculpt25/source/blender/makesdna/DNA_constraint_types.h
branches/sculpt25/source/blender/makesdna/DNA_object_force.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_view3d_types.h
branches/sculpt25/source/blender/makesdna/DNA_windowmanager_types.h
branches/sculpt25/source/blender/makesrna/RNA_access.h
branches/sculpt25/source/blender/makesrna/RNA_define.h
branches/sculpt25/source/blender/makesrna/RNA_enum_types.h
branches/sculpt25/source/blender/makesrna/RNA_types.h
branches/sculpt25/source/blender/makesrna/SConscript
branches/sculpt25/source/blender/makesrna/intern/CMakeLists.txt
branches/sculpt25/source/blender/makesrna/intern/SConscript
branches/sculpt25/source/blender/makesrna/intern/makesrna.c
branches/sculpt25/source/blender/makesrna/intern/rna_access.c
branches/sculpt25/source/blender/makesrna/intern/rna_animation.c
branches/sculpt25/source/blender/makesrna/intern/rna_armature.c
branches/sculpt25/source/blender/makesrna/intern/rna_cloth.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_define.c
branches/sculpt25/source/blender/makesrna/intern/rna_fcurve.c
branches/sculpt25/source/blender/makesrna/intern/rna_fcurve_api.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_internal_types.h
branches/sculpt25/source/blender/makesrna/intern/rna_key.c
branches/sculpt25/source/blender/makesrna/intern/rna_lattice.c
branches/sculpt25/source/blender/makesrna/intern/rna_main.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_nodetree.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_pose.c
branches/sculpt25/source/blender/makesrna/intern/rna_pose_api.c
branches/sculpt25/source/blender/makesrna/intern/rna_render.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_scene_api.c
branches/sculpt25/source/blender/makesrna/intern/rna_screen.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_text.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/nodes/intern/CMP_nodes/CMP_levels.c
branches/sculpt25/source/blender/python/BPY_extern.h
branches/sculpt25/source/blender/python/epy_doc_gen.py
branches/sculpt25/source/blender/python/generic/Geometry.c
branches/sculpt25/source/blender/python/generic/bpy_internal_import.c
branches/sculpt25/source/blender/python/generic/bpy_internal_import.h
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_rna.c
branches/sculpt25/source/blender/python/intern/bpy_rna.h
branches/sculpt25/source/blender/python/intern/bpy_ui.c
branches/sculpt25/source/blender/python/intern/bpy_util.c
branches/sculpt25/source/blender/python/intern/stubs.c
branches/sculpt25/source/blender/quicktime/CMakeLists.txt
branches/sculpt25/source/blender/quicktime/SConscript
branches/sculpt25/source/blender/quicktime/apple/quicktime_export.c
branches/sculpt25/source/blender/quicktime/apple/quicktime_import.c
branches/sculpt25/source/blender/quicktime/quicktime_export.h
branches/sculpt25/source/blender/quicktime/quicktime_import.h
branches/sculpt25/source/blender/render/SConscript
branches/sculpt25/source/blender/render/intern/source/pipeline.c
branches/sculpt25/source/blender/render/intern/source/texture.c
branches/sculpt25/source/blender/windowmanager/CMakeLists.txt
branches/sculpt25/source/blender/windowmanager/SConscript
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_event_system.c
branches/sculpt25/source/blender/windowmanager/intern/wm_files.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/blenderplayer/bad_level_call_stubs/stubs.c
branches/sculpt25/source/creator/creator.c
branches/sculpt25/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/sculpt25/source/gameengine/BlenderRoutines/SConscript
branches/sculpt25/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/sculpt25/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/sculpt25/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/sculpt25/source/gameengine/Converter/BL_MeshDeformer.h
branches/sculpt25/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/sculpt25/source/gameengine/Converter/BL_ModifierDeformer.h
branches/sculpt25/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/sculpt25/source/gameengine/Converter/BL_ShapeDeformer.h
branches/sculpt25/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/sculpt25/source/gameengine/Converter/BL_SkinDeformer.h
branches/sculpt25/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/sculpt25/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/sculpt25/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/sculpt25/source/gameengine/Converter/KX_IpoConvert.cpp
branches/sculpt25/source/gameengine/Converter/Makefile
branches/sculpt25/source/gameengine/GameLogic/SCA_EventManager.h
branches/sculpt25/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/sculpt25/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/sculpt25/source/gameengine/GameLogic/SCA_ISensor.h
branches/sculpt25/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/sculpt25/source/gameengine/GameLogic/SCA_LogicManager.h
branches/sculpt25/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/sculpt25/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/sculpt25/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/sculpt25/source/gameengine/GamePlayer/common/SConscript
branches/sculpt25/source/gameengine/GamePlayer/common/windows/GPW_Engine.cpp
branches/sculpt25/source/gameengine/GamePlayer/ghost/SConscript
branches/sculpt25/source/gameengine/GamePlayer/netscape/Makefile
branches/sculpt25/source/gameengine/Ketsji/CMakeLists.txt
branches/sculpt25/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
branches/sculpt25/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
branches/sculpt25/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/sculpt25/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/sculpt25/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/sculpt25/source/gameengine/Ketsji/KX_GameActuator.cpp
branches/sculpt25/source/gameengine/Ketsji/KX_GameActuator.h
branches/sculpt25/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/sculpt25/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/sculpt25/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/sculpt25/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/sculpt25/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/sculpt25/source/gameengine/Ketsji/KX_RaySensor.h
branches/sculpt25/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/sculpt25/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
branches/sculpt25/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/sculpt25/source/gameengine/Ketsji/KX_Scene.cpp
branches/sculpt25/source/gameengine/Ketsji/KX_Scene.h
branches/sculpt25/source/gameengine/Ketsji/KX_SceneActuator.h
branches/sculpt25/source/gameengine/Ketsji/KX_TouchEventManager.h
branches/sculpt25/source/gameengine/Ketsji/KX_TouchSensor.h
branches/sculpt25/source/gameengine/Ketsji/Makefile
branches/sculpt25/source/gameengine/Ketsji/SConscript
branches/sculpt25/source/gameengine/Physics/Bullet/CcdGraphicController.cpp
branches/sculpt25/source/gameengine/Physics/Bullet/CcdGraphicController.h
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/Bullet/CcdPhysicsEnvironment.h
branches/sculpt25/source/gameengine/Physics/common/PHY_IController.h
branches/sculpt25/source/gameengine/Physics/common/PHY_IGraphicController.h
branches/sculpt25/source/gameengine/Physics/common/PHY_IPhysicsController.h
branches/sculpt25/source/gameengine/PyDoc/GameTypes.py
branches/sculpt25/source/gameengine/Rasterizer/CMakeLists.txt
branches/sculpt25/source/gameengine/Rasterizer/Makefile
branches/sculpt25/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/sculpt25/source/gameengine/Rasterizer/RAS_BucketManager.h
branches/sculpt25/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/sculpt25/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/sculpt25/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/sculpt25/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/sculpt25/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/sculpt25/source/gameengine/Rasterizer/SConscript
branches/sculpt25/source/gameengine/SceneGraph/SG_IObject.h
branches/sculpt25/source/nan_compile.mk
branches/sculpt25/tools/Blender.py
branches/sculpt25/tools/btools.py
Added Paths:
-----------
branches/sculpt25/release/scripts/modules/bpy/
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/rigify.py
branches/sculpt25/release/scripts/modules/rna_prop_ui.py
branches/sculpt25/release/scripts/op/presets.py
branches/sculpt25/release/scripts/presets/
branches/sculpt25/release/scripts/presets/cloth/
branches/sculpt25/release/scripts/presets/cloth/cotton.py
branches/sculpt25/release/scripts/presets/cloth/denim.py
branches/sculpt25/release/scripts/presets/cloth/leather.py
branches/sculpt25/release/scripts/presets/cloth/rubber.py
branches/sculpt25/release/scripts/presets/cloth/silk.py
branches/sculpt25/release/scripts/presets/render/
branches/sculpt25/release/scripts/presets/render/HDTV_1080p.py
branches/sculpt25/release/scripts/presets/render/HDTV_720p.py
branches/sculpt25/release/scripts/presets/render/TV_NTSC.py
branches/sculpt25/release/scripts/presets/render/TV_PAL.py
branches/sculpt25/release/scripts/presets/render/TV_PAL_16_colon_9.py
branches/sculpt25/release/scripts/presets/sss/
branches/sculpt25/release/scripts/presets/sss/apple.py
branches/sculpt25/release/scripts/presets/sss/chicken.py
branches/sculpt25/release/scripts/presets/sss/cream.py
branches/sculpt25/release/scripts/presets/sss/ketchup.py
branches/sculpt25/release/scripts/presets/sss/marble.py
branches/sculpt25/release/scripts/presets/sss/potato.py
branches/sculpt25/release/scripts/presets/sss/skim_milk.py
branches/sculpt25/release/scripts/presets/sss/skin1.py
branches/sculpt25/release/scripts/presets/sss/skin2.py
branches/sculpt25/release/scripts/presets/sss/whole_milk.py
branches/sculpt25/release/text/readme.html
branches/sculpt25/source/blender/python/generic/IDProp.c
branches/sculpt25/source/blender/python/generic/IDProp.h
branches/sculpt25/source/blender/quicktime/apple/qtkit_export.m
branches/sculpt25/source/blender/quicktime/apple/qtkit_import.m
branches/sculpt25/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
branches/sculpt25/source/gameengine/Converter/KX_SoftBodyDeformer.h
Removed Paths:
-------------
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_ext/
branches/sculpt25/release/scripts/modules/bpy_ops.py
branches/sculpt25/release/scripts/modules/bpy_utils.py
branches/sculpt25/release/scripts/presets/cloth/
branches/sculpt25/release/scripts/presets/cloth/cotton.py
branches/sculpt25/release/scripts/presets/cloth/denim.py
branches/sculpt25/release/scripts/presets/cloth/leather.py
branches/sculpt25/release/scripts/presets/cloth/rubber.py
branches/sculpt25/release/scripts/presets/cloth/silk.py
branches/sculpt25/release/scripts/presets/render/
branches/sculpt25/release/scripts/presets/render/HDTV_1080p.py
branches/sculpt25/release/scripts/presets/render/HDTV_720p.py
branches/sculpt25/release/scripts/presets/render/TV_NTSC.py
branches/sculpt25/release/scripts/presets/render/TV_PAL.py
branches/sculpt25/release/scripts/presets/render/TV_PAL_16_colon_9.py
branches/sculpt25/release/scripts/presets/sss/
branches/sculpt25/release/scripts/presets/sss/apple.py
branches/sculpt25/release/scripts/presets/sss/chicken.py
branches/sculpt25/release/scripts/presets/sss/cream.py
branches/sculpt25/release/scripts/presets/sss/ketchup.py
branches/sculpt25/release/scripts/presets/sss/marble.py
branches/sculpt25/release/scripts/presets/sss/potato.py
branches/sculpt25/release/scripts/presets/sss/skim_milk.py
branches/sculpt25/release/scripts/presets/sss/skin1.py
branches/sculpt25/release/scripts/presets/sss/skin2.py
branches/sculpt25/release/scripts/presets/sss/whole_milk.py
branches/sculpt25/release/scripts/ui/properties_data_text.py
branches/sculpt25/release/text/BlenderQuickStart.pdf
branches/sculpt25/release/text/blender.html
branches/sculpt25/release/text/release_249.txt
branches/sculpt25/source/gameengine/Converter/BL_SkinMeshObject.cpp
branches/sculpt25/source/gameengine/Converter/BL_SkinMeshObject.h
Property Changed:
----------------
branches/sculpt25/release/scripts/
branches/sculpt25/release/scripts/modules/
branches/sculpt25/release/scripts/modules/console/
branches/sculpt25/release/scripts/op/
branches/sculpt25/release/scripts/templates/
branches/sculpt25/source/blender/editors/space_node/node_buttons.c
Modified: branches/sculpt25/CMakeLists.txt
===================================================================
--- branches/sculpt25/CMakeLists.txt 2009-11-25 17:46:10 UTC (rev 24892)
+++ branches/sculpt25/CMakeLists.txt 2009-11-25 17:51:16 UTC (rev 24893)
@@ -70,7 +70,6 @@
OPTION(WITH_SDL "Enable SDL for sound and joystick support" ON)
OPTION(WITH_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
-OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
OPTION(WITH_FFTW3 "Enable FFTW3 support" OFF)
OPTION(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF)
@@ -82,9 +81,17 @@
OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
OPTION(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org/)" OFF)
+# Unix defaults to OpenMP On
+IF (UNIX)
+ OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON)
+ELSE(UNIX)
+ OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
+ENDIF(UNIX)
+
IF (APPLE)
-OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
-OPTION(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
+ OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
+ OPTION(USE_QTKIT "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
+ OPTION(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
ENDIF (APPLE)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
@@ -236,7 +243,7 @@
ENDIF(WITH_OPENMP)
- SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -DXP_UNIX -Wno-char-subscripts")
+ SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -Wno-char-subscripts")
SET(PLATFORM_LINKFLAGS "-pthread")
@@ -525,7 +532,15 @@
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 -framework QuickTime")
+ 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)
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")
@@ -579,6 +594,10 @@
SET(CMAKE_C_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller")
ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386")
+ # Better warnings
+ SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement")
+ SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
+
ENDIF(APPLE)
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
Modified: branches/sculpt25/SConstruct
===================================================================
--- branches/sculpt25/SConstruct 2009-11-25 17:46:10 UTC (rev 24892)
+++ branches/sculpt25/SConstruct 2009-11-25 17:51:16 UTC (rev 24893)
@@ -224,6 +224,11 @@
env.Append(CFLAGS=['-DGHOST_COCOA'])
env.Append(CXXFLAGS=['-DGHOST_COCOA'])
env.Append(CPPFLAGS=['-DGHOST_COCOA'])
+
+if env['USE_QTKIT'] == True:
+ env.Append(CFLAGS=['-DUSE_QTKIT'])
+ env.Append(CXXFLAGS=['-DUSE_QTKIT'])
+ env.Append(CPPFLAGS=['-DUSE_QTKIT'])
#check for additional debug libnames
Modified: branches/sculpt25/config/darwin-config.py
===================================================================
--- branches/sculpt25/config/darwin-config.py 2009-11-25 17:46:10 UTC (rev 24892)
+++ branches/sculpt25/config/darwin-config.py 2009-11-25 17:51:16 UTC (rev 24893)
@@ -13,7 +13,6 @@
#############################################################################
################### Cocoa & architecture settings ##################
#############################################################################
-
WITH_GHOST_COCOA=True
MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64
@@ -31,30 +30,36 @@
elif cmd_res[0]=='10':
MAC_CUR_VER='10.6'
-if MACOSX_ARCHITECTURE == 'ppc':
- LCGDIR = '#../lib/darwin-6.1-powerpc'
-else :
- LCGDIR = '#../lib/darwin-9.x.universal'
-LIBDIR = '${LCGDIR}'
-
BF_PYTHON_VERSION = '3.1'
-if MACOSX_ARCHITECTURE == 'ppc' and BF_PYTHON_VERSION == '2.3':
+if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
+ USE_QTKIT=True # Carbon quicktime is not available for 64bit
+
+
+# Default target OSX settings per architecture
+# Can be customized
+
+if MACOSX_ARCHITECTURE == 'ppc':
MAC_MIN_VERS = '10.3'
MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
- CC = 'gcc'
- CXX = 'g++'
-elif MACOSX_ARCHITECTURE == 'i386' or MACOSX_ARCHITECTURE == 'ppc':
+ LCGDIR = '#../lib/darwin-6.1-powerpc'
+ CC = 'gcc-3.3'
+ CXX = 'g++-3.3'
+elif MACOSX_ARCHITECTURE == 'i386':
MAC_MIN_VERS = '10.4'
MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
+ LCGDIR = '#../lib/darwin-8.x.i386'
CC = 'gcc-4.0'
CXX = 'g++-4.0'
else :
MAC_MIN_VERS = '10.5'
MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
+ LCGDIR = '#../lib/darwin-9.x.universal'
CC = 'gcc-4.2'
CXX = 'g++-4.2'
+LIBDIR = '${LCGDIR}'
+
#############################################################################
################### Dependency settings ##################
#############################################################################
@@ -229,10 +234,7 @@
BF_FREETYPE_LIB = 'freetype'
BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
-if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
- WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME ( disable for 64bit atm )
-else:
- WITH_BF_QUICKTIME = True
+WITH_BF_QUICKTIME = True
WITH_BF_ICONV = True
BF_ICONV = '/usr'
@@ -285,7 +287,10 @@
PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Carbon','-framework','AGL','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
if WITH_BF_QUICKTIME == True:
- PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime']
+ if USE_QTKIT == True:
+ PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QTKit']
+ else:
+ PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime']
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
LLIBS = ['stdc++', 'SystemStubs']
Modified: branches/sculpt25/config/irix6-config.py
===================================================================
--- branches/sculpt25/config/irix6-config.py 2009-11-25 17:46:10 UTC (rev 24892)
+++ branches/sculpt25/config/irix6-config.py 2009-11-25 17:51:16 UTC (rev 24893)
@@ -161,7 +161,7 @@
CCFLAGS = ['-pipe','-fPIC', '-n32']
-CPPFLAGS = ['-DXP_UNIX']
+CPPFLAGS = []
CXXFLAGS = ['-pipe','-fPIC', '-n32']
REL_CFLAGS = ['-O2']
REL_CCFLAGS = ['-O2']
Modified: branches/sculpt25/config/linux2-config.py
===================================================================
--- branches/sculpt25/config/linux2-config.py 2009-11-25 17:46:10 UTC (rev 24892)
+++ branches/sculpt25/config/linux2-config.py 2009-11-25 17:51:16 UTC (rev 24893)
@@ -165,6 +165,8 @@
BF_EXPAT_LIB = 'expat'
BF_EXPAT_LIBPATH = '/usr/lib'
+WITH_BF_OPENMP = True
+
##
CC = 'gcc'
CXX = 'g++'
@@ -173,7 +175,7 @@
CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
-CPPFLAGS = ['-DXP_UNIX']
+CPPFLAGS = []
CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
REL_CFLAGS = ['-O2']
REL_CCFLAGS = ['-O2']
Modified: branches/sculpt25/config/linuxcross-config.py
===================================================================
--- branches/sculpt25/config/linuxcross-config.py 2009-11-25 17:46:10 UTC (rev 24892)
+++ branches/sculpt25/config/linuxcross-config.py 2009-11-25 17:51:16 UTC (rev 24893)
@@ -119,7 +119,7 @@
CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
-CPPFLAGS = [ '-DXP_UNIX', '-DWIN32', '-DFREE_WINDOWS' ]
+CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS']
CXXFLAGS = ['-pipe', '-mwindows', '-funsigned-char', '-fno-strict-aliasing' ]
REL_CFLAGS = [ '-O2' ]
REL_CCFLAGS = [ '-O2' ]
Modified: branches/sculpt25/config/sunos5-config.py
===================================================================
--- branches/sculpt25/config/sunos5-config.py 2009-11-25 17:46:10 UTC (rev 24892)
+++ branches/sculpt25/config/sunos5-config.py 2009-11-25 17:51:16 UTC (rev 24893)
@@ -136,7 +136,7 @@
CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
-CPPFLAGS = ['-DXP_UNIX', '-DSUN_OGL_NO_VERTEX_MACROS']
+CPPFLAGS = ['-DSUN_OGL_NO_VERTEX_MACROS']
CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
REL_CFLAGS = ['-O2']
REL_CCFLAGS = ['-O2']
Modified: branches/sculpt25/config/win32-mingw-config.py
===================================================================
--- branches/sculpt25/config/win32-mingw-config.py 2009-11-25 17:46:10 UTC (rev 24892)
+++ branches/sculpt25/config/win32-mingw-config.py 2009-11-25 17:51:16 UTC (rev 24893)
@@ -136,7 +136,7 @@
CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
-CPPFLAGS = [ '-DXP_UNIX', '-DWIN32', '-DFREE_WINDOWS' ]
+CPPFLAGS = ['-DWIN32', '-DFREE_WINDOWS']
CXXFLAGS = ['-pipe', '-mwindows', '-funsigned-char', '-fno-strict-aliasing' ]
REL_CFLAGS = [ '-O2' ]
REL_CCFLAGS = [ '-O2' ]
Modified: branches/sculpt25/extern/glew/CMakeLists.txt
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list