[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26770] branches/render25: Render Branch:
Brecht Van Lommel
brecht at blender.org
Wed Feb 10 15:54:39 CET 2010
Revision: 26770
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26770
Author: blendix
Date: 2010-02-10 15:54:38 +0100 (Wed, 10 Feb 2010)
Log Message:
-----------
Render Branch:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r26366:26768
Modified Paths:
--------------
branches/render25/CMakeLists.txt
branches/render25/SConstruct
branches/render25/config/darwin-config.py
branches/render25/config/linux2-config.py
branches/render25/config/linuxcross-config.py
branches/render25/config/win32-mingw-config.py
branches/render25/config/win32-vc-config.py
branches/render25/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
branches/render25/extern/bullet2/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
branches/render25/extern/ffmpeg/SConscript
branches/render25/extern/x264/SConscript
branches/render25/intern/audaspace/FX/AUD_FaderReader.cpp
branches/render25/intern/audaspace/FX/AUD_LoopReader.cpp
branches/render25/intern/audaspace/FX/AUD_LoopReader.h
branches/render25/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/render25/intern/audaspace/SRC/AUD_SRCResampleReader.cpp
branches/render25/intern/audaspace/SRC/AUD_SRCResampleReader.h
branches/render25/intern/audaspace/intern/AUD_C-API.cpp
branches/render25/intern/audaspace/intern/AUD_C-API.h
branches/render25/intern/audaspace/intern/AUD_Mixer.cpp
branches/render25/intern/audaspace/intern/AUD_Mixer.h
branches/render25/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/render25/intern/audaspace/intern/AUD_Space.h
branches/render25/intern/audaspace/make/msvc_9_0/audaspace.vcproj
branches/render25/intern/elbeem/SConscript
branches/render25/intern/ghost/CMakeLists.txt
branches/render25/intern/ghost/GHOST_IWindow.h
branches/render25/intern/ghost/GHOST_Types.h
branches/render25/intern/ghost/SConscript
branches/render25/intern/ghost/intern/GHOST_EventDragnDrop.h
branches/render25/intern/ghost/intern/GHOST_EventPrinter.cpp
branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/render25/intern/ghost/intern/GHOST_Window.cpp
branches/render25/intern/ghost/intern/GHOST_Window.h
branches/render25/intern/ghost/intern/GHOST_WindowCocoa.h
branches/render25/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/render25/intern/ghost/intern/GHOST_WindowManager.cpp
branches/render25/intern/ghost/intern/GHOST_WindowManager.h
branches/render25/intern/ghost/intern/Makefile
branches/render25/intern/ghost/make/msvc_9_0/ghost.vcproj
branches/render25/intern/guardedalloc/MEM_guardedalloc.h
branches/render25/intern/guardedalloc/intern/mallocn.c
branches/render25/intern/iksolver/intern/IK_QSegment.cpp
branches/render25/intern/opennl/superlu/get_perm_c.c
branches/render25/intern/smoke/SConscript
branches/render25/intern/smoke/intern/FLUID_3D.cpp
branches/render25/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/render25/intern/smoke/intern/WAVELET_NOISE.h
branches/render25/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
branches/render25/projectfiles_vc9/blender/blender.vcproj
branches/render25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
branches/render25/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/render25/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/render25/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
branches/render25/release/scripts/io/engine_render_pov.py
branches/render25/release/scripts/io/export_3ds.py
branches/render25/release/scripts/io/export_fbx.py
branches/render25/release/scripts/io/export_mdd.py
branches/render25/release/scripts/io/export_obj.py
branches/render25/release/scripts/io/export_ply.py
branches/render25/release/scripts/io/export_x3d.py
branches/render25/release/scripts/io/import_scene_3ds.py
branches/render25/release/scripts/io/import_scene_obj.py
branches/render25/release/scripts/io/netrender/__init__.py
branches/render25/release/scripts/io/netrender/balancing.py
branches/render25/release/scripts/io/netrender/master.py
branches/render25/release/scripts/io/netrender/master_html.py
branches/render25/release/scripts/io/netrender/slave.py
branches/render25/release/scripts/io/netrender/ui.py
branches/render25/release/scripts/io/netrender/utils.py
branches/render25/release/scripts/modules/bpy/__init__.py
branches/render25/release/scripts/modules/bpy/ops.py
branches/render25/release/scripts/modules/bpy/utils.py
branches/render25/release/scripts/modules/bpy_types.py
branches/render25/release/scripts/modules/rigify/__init__.py
branches/render25/release/scripts/modules/rigify/arm_biped.py
branches/render25/release/scripts/modules/rigify/copy.py
branches/render25/release/scripts/modules/rigify/eye_balls.py
branches/render25/release/scripts/modules/rigify/eye_lid.py
branches/render25/release/scripts/modules/rigify/finger_curl.py
branches/render25/release/scripts/modules/rigify/leg_biped.py
branches/render25/release/scripts/modules/rigify/leg_quadruped.py
branches/render25/release/scripts/modules/rigify/mouth.py
branches/render25/release/scripts/modules/rigify/neck_flex.py
branches/render25/release/scripts/modules/rigify/palm_curl.py
branches/render25/release/scripts/modules/rigify/shape_key_distance.py
branches/render25/release/scripts/modules/rigify/shape_key_rotdiff.py
branches/render25/release/scripts/modules/rigify/spine_pivot_flex.py
branches/render25/release/scripts/modules/rigify/stretch.py
branches/render25/release/scripts/modules/rigify/stretch_twist.py
branches/render25/release/scripts/modules/rigify/track_dual.py
branches/render25/release/scripts/modules/rigify/track_reverse.py
branches/render25/release/scripts/modules/rigify_utils.py
branches/render25/release/scripts/modules/rna_prop_ui.py
branches/render25/release/scripts/op/add_mesh_torus.py
branches/render25/release/scripts/op/mesh.py
branches/render25/release/scripts/op/object.py
branches/render25/release/scripts/op/object_randomize_transform.py
branches/render25/release/scripts/op/presets.py
branches/render25/release/scripts/op/screen_play_rendered_anim.py
branches/render25/release/scripts/op/uv.py
branches/render25/release/scripts/op/uvcalc_follow_active.py
branches/render25/release/scripts/op/wm.py
branches/render25/release/scripts/templates/operator.py
branches/render25/release/scripts/templates/operator_uv.py
branches/render25/release/scripts/templates/panel_simple.py
branches/render25/release/scripts/ui/properties_animviz.py
branches/render25/release/scripts/ui/properties_data_armature.py
branches/render25/release/scripts/ui/properties_data_camera.py
branches/render25/release/scripts/ui/properties_data_curve.py
branches/render25/release/scripts/ui/properties_data_lamp.py
branches/render25/release/scripts/ui/properties_data_mesh.py
branches/render25/release/scripts/ui/properties_data_metaball.py
branches/render25/release/scripts/ui/properties_data_modifier.py
branches/render25/release/scripts/ui/properties_material.py
branches/render25/release/scripts/ui/properties_object.py
branches/render25/release/scripts/ui/properties_object_constraint.py
branches/render25/release/scripts/ui/properties_render.py
branches/render25/release/scripts/ui/properties_scene.py
branches/render25/release/scripts/ui/properties_texture.py
branches/render25/release/scripts/ui/properties_world.py
branches/render25/release/scripts/ui/space_dopesheet.py
branches/render25/release/scripts/ui/space_graph.py
branches/render25/release/scripts/ui/space_image.py
branches/render25/release/scripts/ui/space_info.py
branches/render25/release/scripts/ui/space_node.py
branches/render25/release/scripts/ui/space_sequencer.py
branches/render25/release/scripts/ui/space_userpref.py
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/release/scripts/ui/space_view3d_toolbar.py
branches/render25/source/SConscript
branches/render25/source/blender/blenfont/SConscript
branches/render25/source/blender/blenkernel/BKE_animsys.h
branches/render25/source/blender/blenkernel/BKE_constraint.h
branches/render25/source/blender/blenkernel/BKE_deform.h
branches/render25/source/blender/blenkernel/BKE_depsgraph.h
branches/render25/source/blender/blenkernel/BKE_fcurve.h
branches/render25/source/blender/blenkernel/BKE_global.h
branches/render25/source/blender/blenkernel/BKE_material.h
branches/render25/source/blender/blenkernel/BKE_multires.h
branches/render25/source/blender/blenkernel/BKE_scene.h
branches/render25/source/blender/blenkernel/BKE_screen.h
branches/render25/source/blender/blenkernel/BKE_sequencer.h
branches/render25/source/blender/blenkernel/BKE_sound.h
branches/render25/source/blender/blenkernel/BKE_texture.h
branches/render25/source/blender/blenkernel/BKE_utildefines.h
branches/render25/source/blender/blenkernel/BKE_writeffmpeg.h
branches/render25/source/blender/blenkernel/CMakeLists.txt
branches/render25/source/blender/blenkernel/SConscript
branches/render25/source/blender/blenkernel/intern/CCGSubSurf.c
branches/render25/source/blender/blenkernel/intern/DerivedMesh.c
branches/render25/source/blender/blenkernel/intern/Makefile
branches/render25/source/blender/blenkernel/intern/action.c
branches/render25/source/blender/blenkernel/intern/anim.c
branches/render25/source/blender/blenkernel/intern/anim_sys.c
branches/render25/source/blender/blenkernel/intern/armature.c
branches/render25/source/blender/blenkernel/intern/blender.c
branches/render25/source/blender/blenkernel/intern/cdderivedmesh.c
branches/render25/source/blender/blenkernel/intern/collision.c
branches/render25/source/blender/blenkernel/intern/colortools.c
branches/render25/source/blender/blenkernel/intern/constraint.c
branches/render25/source/blender/blenkernel/intern/curve.c
branches/render25/source/blender/blenkernel/intern/deform.c
branches/render25/source/blender/blenkernel/intern/depsgraph.c
branches/render25/source/blender/blenkernel/intern/displist.c
branches/render25/source/blender/blenkernel/intern/exotic.c
branches/render25/source/blender/blenkernel/intern/fcurve.c
branches/render25/source/blender/blenkernel/intern/fluidsim.c
branches/render25/source/blender/blenkernel/intern/image.c
branches/render25/source/blender/blenkernel/intern/ipo.c
branches/render25/source/blender/blenkernel/intern/key.c
branches/render25/source/blender/blenkernel/intern/library.c
branches/render25/source/blender/blenkernel/intern/material.c
branches/render25/source/blender/blenkernel/intern/modifier.c
branches/render25/source/blender/blenkernel/intern/multires.c
branches/render25/source/blender/blenkernel/intern/node.c
branches/render25/source/blender/blenkernel/intern/object.c
branches/render25/source/blender/blenkernel/intern/particle_system.c
branches/render25/source/blender/blenkernel/intern/pointcache.c
branches/render25/source/blender/blenkernel/intern/scene.c
branches/render25/source/blender/blenkernel/intern/screen.c
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/blenkernel/intern/softbody.c
branches/render25/source/blender/blenkernel/intern/sound.c
branches/render25/source/blender/blenkernel/intern/subsurf_ccg.c
branches/render25/source/blender/blenkernel/intern/text.c
branches/render25/source/blender/blenkernel/intern/texture.c
branches/render25/source/blender/blenkernel/intern/writeavi.c
branches/render25/source/blender/blenkernel/intern/writeffmpeg.c
branches/render25/source/blender/blenlib/BLI_listbase.h
branches/render25/source/blender/blenlib/BLI_math_matrix.h
branches/render25/source/blender/blenlib/BLI_path_util.h
branches/render25/source/blender/blenlib/BLI_threads.h
branches/render25/source/blender/blenlib/SConscript
branches/render25/source/blender/blenlib/intern/BLI_ghash.c
branches/render25/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/render25/source/blender/blenlib/intern/BLI_kdtree.c
branches/render25/source/blender/blenlib/intern/BLI_mempool.c
branches/render25/source/blender/blenlib/intern/bpath.c
branches/render25/source/blender/blenlib/intern/fileops.c
branches/render25/source/blender/blenlib/intern/listbase.c
branches/render25/source/blender/blenlib/intern/math_base_inline.c
branches/render25/source/blender/blenlib/intern/math_geom.c
branches/render25/source/blender/blenlib/intern/math_matrix.c
branches/render25/source/blender/blenlib/intern/noise.c
branches/render25/source/blender/blenlib/intern/path_util.c
branches/render25/source/blender/blenlib/intern/pbvh.c
branches/render25/source/blender/blenlib/intern/storage.c
branches/render25/source/blender/blenlib/intern/threads.c
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/blenloader/intern/writefile.c
branches/render25/source/blender/collada/DocumentExporter.cpp
branches/render25/source/blender/collada/DocumentImporter.cpp
branches/render25/source/blender/editors/animation/anim_channels_defines.c
branches/render25/source/blender/editors/animation/anim_channels_edit.c
branches/render25/source/blender/editors/animation/anim_draw.c
branches/render25/source/blender/editors/animation/anim_filter.c
branches/render25/source/blender/editors/animation/anim_markers.c
branches/render25/source/blender/editors/animation/anim_ops.c
branches/render25/source/blender/editors/animation/drivers.c
branches/render25/source/blender/editors/animation/keyframes_edit.c
branches/render25/source/blender/editors/animation/keyframing.c
branches/render25/source/blender/editors/animation/keyingsets.c
branches/render25/source/blender/editors/armature/editarmature.c
branches/render25/source/blender/editors/armature/editarmature_sketch.c
branches/render25/source/blender/editors/armature/poseobject.c
branches/render25/source/blender/editors/curve/editfont.c
branches/render25/source/blender/editors/gpencil/gpencil_paint.c
branches/render25/source/blender/editors/include/BIF_glutil.h
branches/render25/source/blender/editors/include/ED_anim_api.h
branches/render25/source/blender/editors/include/ED_keyframes_edit.h
branches/render25/source/blender/editors/include/ED_mesh.h
branches/render25/source/blender/editors/include/ED_object.h
branches/render25/source/blender/editors/include/ED_space_api.h
branches/render25/source/blender/editors/include/ED_view3d.h
branches/render25/source/blender/editors/interface/interface.c
branches/render25/source/blender/editors/interface/interface_draw.c
branches/render25/source/blender/editors/interface/interface_handlers.c
branches/render25/source/blender/editors/interface/interface_icons.c
branches/render25/source/blender/editors/interface/interface_intern.h
branches/render25/source/blender/editors/interface/interface_regions.c
branches/render25/source/blender/editors/interface/interface_templates.c
branches/render25/source/blender/editors/interface/resources.c
branches/render25/source/blender/editors/interface/view2d.c
branches/render25/source/blender/editors/interface/view2d_ops.c
branches/render25/source/blender/editors/mesh/editmesh.c
branches/render25/source/blender/editors/mesh/editmesh_add.c
branches/render25/source/blender/editors/mesh/editmesh_lib.c
branches/render25/source/blender/editors/mesh/editmesh_loop.c
branches/render25/source/blender/editors/mesh/editmesh_mods.c
branches/render25/source/blender/editors/mesh/editmesh_tools.c
branches/render25/source/blender/editors/mesh/loopcut.c
branches/render25/source/blender/editors/mesh/mesh_ops.c
branches/render25/source/blender/editors/mesh/meshtools.c
branches/render25/source/blender/editors/object/object_add.c
branches/render25/source/blender/editors/object/object_bake.c
branches/render25/source/blender/editors/object/object_constraint.c
branches/render25/source/blender/editors/object/object_intern.h
branches/render25/source/blender/editors/object/object_ops.c
branches/render25/source/blender/editors/object/object_transform.c
branches/render25/source/blender/editors/object/object_vgroup.c
branches/render25/source/blender/editors/physics/particle_edit.c
branches/render25/source/blender/editors/physics/physics_fluid.c
branches/render25/source/blender/editors/render/render_intern.h
branches/render25/source/blender/editors/render/render_ops.c
branches/render25/source/blender/editors/render/render_preview.c
branches/render25/source/blender/editors/render/render_shading.c
branches/render25/source/blender/editors/screen/area.c
branches/render25/source/blender/editors/screen/glutil.c
branches/render25/source/blender/editors/screen/screen_ops.c
branches/render25/source/blender/editors/sculpt_paint/paint_image.c
branches/render25/source/blender/editors/sculpt_paint/paint_ops.c
branches/render25/source/blender/editors/sculpt_paint/paint_vertex.c
branches/render25/source/blender/editors/sculpt_paint/sculpt.c
branches/render25/source/blender/editors/sound/sound_ops.c
branches/render25/source/blender/editors/space_action/action_edit.c
branches/render25/source/blender/editors/space_action/action_intern.h
branches/render25/source/blender/editors/space_action/action_ops.c
branches/render25/source/blender/editors/space_action/action_select.c
branches/render25/source/blender/editors/space_buttons/buttons_context.c
branches/render25/source/blender/editors/space_buttons/buttons_ops.c
branches/render25/source/blender/editors/space_file/file_draw.c
branches/render25/source/blender/editors/space_file/filelist.c
branches/render25/source/blender/editors/space_file/writeimage.c
branches/render25/source/blender/editors/space_graph/graph_draw.c
branches/render25/source/blender/editors/space_graph/graph_edit.c
branches/render25/source/blender/editors/space_graph/graph_intern.h
branches/render25/source/blender/editors/space_graph/graph_ops.c
branches/render25/source/blender/editors/space_graph/graph_select.c
branches/render25/source/blender/editors/space_graph/graph_utils.c
branches/render25/source/blender/editors/space_image/image_buttons.c
branches/render25/source/blender/editors/space_image/image_draw.c
branches/render25/source/blender/editors/space_image/image_intern.h
branches/render25/source/blender/editors/space_image/image_ops.c
branches/render25/source/blender/editors/space_image/space_image.c
branches/render25/source/blender/editors/space_info/info_ops.c
branches/render25/source/blender/editors/space_info/space_info.c
branches/render25/source/blender/editors/space_logic/logic_window.c
branches/render25/source/blender/editors/space_nla/nla_channels.c
branches/render25/source/blender/editors/space_nla/nla_edit.c
branches/render25/source/blender/editors/space_node/drawnode.c
branches/render25/source/blender/editors/space_node/node_draw.c
branches/render25/source/blender/editors/space_node/node_edit.c
branches/render25/source/blender/editors/space_node/node_select.c
branches/render25/source/blender/editors/space_outliner/outliner.c
branches/render25/source/blender/editors/space_sequencer/sequencer_add.c
branches/render25/source/blender/editors/space_sequencer/sequencer_draw.c
branches/render25/source/blender/editors/space_sequencer/sequencer_edit.c
branches/render25/source/blender/editors/space_sequencer/sequencer_intern.h
branches/render25/source/blender/editors/space_sequencer/space_sequencer.c
branches/render25/source/blender/editors/space_text/space_text.c
branches/render25/source/blender/editors/space_text/text_draw.c
branches/render25/source/blender/editors/space_text/text_intern.h
branches/render25/source/blender/editors/space_text/text_ops.c
branches/render25/source/blender/editors/space_view3d/drawarmature.c
branches/render25/source/blender/editors/space_view3d/drawobject.c
branches/render25/source/blender/editors/space_view3d/drawvolume.c
branches/render25/source/blender/editors/space_view3d/space_view3d.c
branches/render25/source/blender/editors/space_view3d/view3d_draw.c
branches/render25/source/blender/editors/space_view3d/view3d_edit.c
branches/render25/source/blender/editors/space_view3d/view3d_header.c
branches/render25/source/blender/editors/space_view3d/view3d_select.c
branches/render25/source/blender/editors/space_view3d/view3d_view.c
branches/render25/source/blender/editors/transform/transform.c
branches/render25/source/blender/editors/transform/transform.h
branches/render25/source/blender/editors/transform/transform_conversions.c
branches/render25/source/blender/editors/transform/transform_generics.c
branches/render25/source/blender/editors/transform/transform_input.c
branches/render25/source/blender/editors/transform/transform_manipulator.c
branches/render25/source/blender/editors/transform/transform_snap.c
branches/render25/source/blender/editors/util/editmode_undo.c
branches/render25/source/blender/editors/uvedit/uvedit_ops.c
branches/render25/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/render25/source/blender/gpu/GPU_extensions.h
branches/render25/source/blender/gpu/intern/gpu_buffers.c
branches/render25/source/blender/gpu/intern/gpu_draw.c
branches/render25/source/blender/gpu/intern/gpu_extensions.c
branches/render25/source/blender/imbuf/intern/dds/dds_api.cpp
branches/render25/source/blender/imbuf/intern/dynlibtiff.c
branches/render25/source/blender/imbuf/intern/gen_dynlibtiff.py
branches/render25/source/blender/imbuf/intern/iff.c
branches/render25/source/blender/imbuf/intern/thumbs.c
branches/render25/source/blender/makesdna/DNA_actuator_types.h
branches/render25/source/blender/makesdna/DNA_constraint_types.h
branches/render25/source/blender/makesdna/DNA_curve_types.h
branches/render25/source/blender/makesdna/DNA_scene_types.h
branches/render25/source/blender/makesdna/DNA_sensor_types.h
branches/render25/source/blender/makesdna/DNA_sequence_types.h
branches/render25/source/blender/makesdna/DNA_sound_types.h
branches/render25/source/blender/makesdna/DNA_space_types.h
branches/render25/source/blender/makesdna/DNA_text_types.h
branches/render25/source/blender/makesdna/DNA_userdef_types.h
branches/render25/source/blender/makesdna/DNA_view2d_types.h
branches/render25/source/blender/makesdna/DNA_view3d_types.h
branches/render25/source/blender/makesdna/DNA_windowmanager_types.h
branches/render25/source/blender/makesdna/intern/SConscript
branches/render25/source/blender/makesrna/RNA_access.h
branches/render25/source/blender/makesrna/RNA_enum_types.h
branches/render25/source/blender/makesrna/RNA_types.h
branches/render25/source/blender/makesrna/intern/makesrna.c
branches/render25/source/blender/makesrna/intern/rna_ID.c
branches/render25/source/blender/makesrna/intern/rna_access.c
branches/render25/source/blender/makesrna/intern/rna_action.c
branches/render25/source/blender/makesrna/intern/rna_actuator.c
branches/render25/source/blender/makesrna/intern/rna_armature.c
branches/render25/source/blender/makesrna/intern/rna_brush.c
branches/render25/source/blender/makesrna/intern/rna_camera.c
branches/render25/source/blender/makesrna/intern/rna_color.c
branches/render25/source/blender/makesrna/intern/rna_constraint.c
branches/render25/source/blender/makesrna/intern/rna_controller.c
branches/render25/source/blender/makesrna/intern/rna_curve.c
branches/render25/source/blender/makesrna/intern/rna_define.c
branches/render25/source/blender/makesrna/intern/rna_fcurve.c
branches/render25/source/blender/makesrna/intern/rna_image_api.c
branches/render25/source/blender/makesrna/intern/rna_lamp.c
branches/render25/source/blender/makesrna/intern/rna_material.c
branches/render25/source/blender/makesrna/intern/rna_material_api.c
branches/render25/source/blender/makesrna/intern/rna_mesh.c
branches/render25/source/blender/makesrna/intern/rna_object.c
branches/render25/source/blender/makesrna/intern/rna_particle.c
branches/render25/source/blender/makesrna/intern/rna_rna.c
branches/render25/source/blender/makesrna/intern/rna_scene.c
branches/render25/source/blender/makesrna/intern/rna_sensor.c
branches/render25/source/blender/makesrna/intern/rna_sequencer.c
branches/render25/source/blender/makesrna/intern/rna_space.c
branches/render25/source/blender/makesrna/intern/rna_texture.c
branches/render25/source/blender/makesrna/intern/rna_ui.c
branches/render25/source/blender/makesrna/intern/rna_userdef.c
branches/render25/source/blender/makesrna/intern/rna_wm.c
branches/render25/source/blender/makesrna/intern/rna_wm_api.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/render25/source/blender/nodes/intern/TEX_nodes/TEX_output.c
branches/render25/source/blender/nodes/intern/TEX_util.c
branches/render25/source/blender/python/CMakeLists.txt
branches/render25/source/blender/python/doc/epy/Mathutils.py
branches/render25/source/blender/python/generic/BGL.c
branches/render25/source/blender/python/generic/BGL.h
branches/render25/source/blender/python/generic/IDProp.c
branches/render25/source/blender/python/generic/Mathutils.c
branches/render25/source/blender/python/generic/euler.c
branches/render25/source/blender/python/generic/matrix.c
branches/render25/source/blender/python/generic/quat.c
branches/render25/source/blender/python/generic/vector.c
branches/render25/source/blender/python/intern/bpy_interface.c
branches/render25/source/blender/python/intern/bpy_operator.c
branches/render25/source/blender/python/intern/bpy_props.c
branches/render25/source/blender/python/intern/bpy_props.h
branches/render25/source/blender/python/intern/bpy_rna.c
branches/render25/source/blender/python/intern/bpy_rna.h
branches/render25/source/blender/python/intern/bpy_util.c
branches/render25/source/blender/python/intern/bpy_util.h
branches/render25/source/blender/quicktime/apple/qtkit_export.m
branches/render25/source/blender/quicktime/apple/qtkit_import.m
branches/render25/source/blender/render/CMakeLists.txt
branches/render25/source/blender/render/SConscript
branches/render25/source/blender/render/extern/include/RE_pipeline.h
branches/render25/source/blender/render/intern/include/render_types.h
branches/render25/source/blender/render/intern/include/shading.h
branches/render25/source/blender/render/intern/include/shadowbuf.h
branches/render25/source/blender/render/intern/source/bake.c
branches/render25/source/blender/render/intern/source/object_mesh.c
branches/render25/source/blender/render/intern/source/pipeline.c
branches/render25/source/blender/render/intern/source/pixelfilter.c
branches/render25/source/blender/render/intern/source/rayshade.c
branches/render25/source/blender/render/intern/source/result.c
branches/render25/source/blender/render/intern/source/shadeinput.c
branches/render25/source/blender/render/intern/source/shadeoutput.c
branches/render25/source/blender/render/intern/source/shadowbuf.c
branches/render25/source/blender/render/intern/source/texture_envmap.c
branches/render25/source/blender/render/intern/source/texture_stack.c
branches/render25/source/blender/render/intern/source/texture_voxeldata.c
branches/render25/source/blender/render/intern/source/zbuf.c
branches/render25/source/blender/windowmanager/WM_api.h
branches/render25/source/blender/windowmanager/WM_types.h
branches/render25/source/blender/windowmanager/intern/wm.c
branches/render25/source/blender/windowmanager/intern/wm_draw.c
branches/render25/source/blender/windowmanager/intern/wm_event_system.c
branches/render25/source/blender/windowmanager/intern/wm_gesture.c
branches/render25/source/blender/windowmanager/intern/wm_keymap.c
branches/render25/source/blender/windowmanager/intern/wm_operators.c
branches/render25/source/blender/windowmanager/intern/wm_subwindow.c
branches/render25/source/blender/windowmanager/intern/wm_window.c
branches/render25/source/blender/windowmanager/wm_event_types.h
branches/render25/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/render25/source/creator/creator.c
branches/render25/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/render25/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/render25/source/gameengine/GameLogic/SCA_ISensor.h
branches/render25/source/gameengine/Ketsji/CMakeLists.txt
branches/render25/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/render25/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/render25/source/gameengine/Ketsji/KX_GameObject.cpp
branches/render25/source/gameengine/Ketsji/KX_Light.cpp
branches/render25/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/render25/source/gameengine/Ketsji/KX_Scene.cpp
branches/render25/source/gameengine/Ketsji/KX_Scene.h
branches/render25/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/render25/source/gameengine/Ketsji/KX_SoundActuator.h
branches/render25/source/gameengine/Ketsji/SConscript
branches/render25/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/render25/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/render25/source/gameengine/PyDoc/GameLogic.py
branches/render25/source/gameengine/PyDoc/GameTypes.py
branches/render25/source/gameengine/PyDoc/VideoTexture.py
branches/render25/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/render25/source/gameengine/VideoTexture/ImageBase.cpp
branches/render25/source/gameengine/VideoTexture/ImageBase.h
branches/render25/source/gameengine/VideoTexture/ImageMix.cpp
branches/render25/source/gameengine/VideoTexture/ImageMix.h
branches/render25/source/gameengine/VideoTexture/ImageRender.cpp
branches/render25/source/gameengine/VideoTexture/ImageRender.h
branches/render25/source/gameengine/VideoTexture/ImageViewport.cpp
branches/render25/source/gameengine/VideoTexture/ImageViewport.h
branches/render25/source/gameengine/VideoTexture/SConscript
branches/render25/source/gameengine/VideoTexture/Texture.cpp
branches/render25/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/render25/source/gameengine/VideoTexture/VideoFFmpeg.h
branches/render25/source/icons/SConscript
branches/render25/tools/Blender.py
branches/render25/tools/btools.py
branches/render25/tools/crossmingw.py
Added Paths:
-----------
branches/render25/intern/audaspace/intern/AUD_SequencerFactory.cpp
branches/render25/intern/audaspace/intern/AUD_SequencerFactory.h
branches/render25/intern/audaspace/intern/AUD_SequencerReader.cpp
branches/render25/intern/audaspace/intern/AUD_SequencerReader.h
branches/render25/intern/ghost/intern/GHOST_EventString.h
branches/render25/release/scripts/cfg/
branches/render25/release/scripts/modules/rigify/shape_key_transforms.py
branches/render25/release/scripts/op/sequencer.py
branches/render25/release/scripts/presets/sunsky/
branches/render25/source/blender/blenlib/BLI_args.h
branches/render25/source/blender/blenlib/intern/BLI_args.c
branches/render25/source/blender/python/doc/examples/
branches/render25/source/blender/python/doc/examples/mathutils.py
branches/render25/source/blender/python/doc/examples/mathutils_euler.py
branches/render25/source/blender/python/doc/examples/mathutils_matrix.py
branches/render25/source/blender/python/doc/examples/mathutils_quat.py
branches/render25/source/blender/python/doc/examples/mathutils_vector.py
branches/render25/source/blender/python/doc/sphinx_doc_gen.py
branches/render25/source/blender/python/generic/CMakeLists.txt
branches/render25/source/blender/python/intern/bpy_app.c
branches/render25/source/blender/python/intern/bpy_app.h
Removed Paths:
-------------
branches/render25/release/scripts/modules/bpy/app.py
branches/render25/source/blender/python/doc/examples/mathutils.py
branches/render25/source/blender/python/doc/examples/mathutils_euler.py
branches/render25/source/blender/python/doc/examples/mathutils_matrix.py
branches/render25/source/blender/python/doc/examples/mathutils_quat.py
branches/render25/source/blender/python/doc/examples/mathutils_vector.py
branches/render25/source/blender/python/intern/bpy_ui.c
branches/render25/source/blender/python/intern/bpy_ui.h
branches/render25/source/blender/python/sphinx_doc_gen.py
Modified: branches/render25/CMakeLists.txt
===================================================================
--- branches/render25/CMakeLists.txt 2010-02-10 14:52:02 UTC (rev 26769)
+++ branches/render25/CMakeLists.txt 2010-02-10 14:54:38 UTC (rev 26770)
@@ -88,6 +88,8 @@
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
ENDIF()
+OPTION(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" OFF)
+
IF (APPLE)
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)
@@ -217,7 +219,7 @@
IF (WITH_OPENCOLLADA)
SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
- SET(OPENCOLLADA_LIB OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre ftoa Buffer)
+ 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)
@@ -414,7 +416,7 @@
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 )
+ SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2 buffer ftoa)
#pcre is bundled with openCollada
#SET(PCRE ${LIBDIR}/pcre)
#SET(PCRE_LIBPATH ${PCRE}/lib)
@@ -558,7 +560,7 @@
SET(OPENCOLLADA ${LIBDIR}/opencollada)
SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
- SET(OPENCOLLADA_LIB "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2" )
+ SET(OPENCOLLADA_LIB "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2 -lbuffer -lftoa" )
#pcre is bundled with openCollada
#SET(PCRE ${LIBDIR}/pcre)
#SET(PCRE_LIBPATH ${PCRE}/lib)
Modified: branches/render25/SConstruct
===================================================================
--- branches/render25/SConstruct 2010-02-10 14:52:02 UTC (rev 26769)
+++ branches/render25/SConstruct 2010-02-10 14:54:38 UTC (rev 26770)
@@ -169,8 +169,10 @@
env.Tool('crossmingw', ['tools'])
# todo: determine proper libs/includes etc.
# Needed for gui programs, console programs should do without it
- env.Append(LINKFLAGS=['-mwindows'])
+ # Now we don't need this option to have console window
+ # env.Append(LINKFLAGS=['-mwindows'])
+
userconfig = B.arguments.get('BF_CONFIG', 'user-config.py')
# first read platform config. B.arguments will override
optfiles = [configfile]
@@ -524,7 +526,11 @@
# TODO - add more libs, for now this lets blenderlite run
if env['OURPLATFORM']=='linuxcross':
dir=env['BF_INSTALLDIR']
- source = ['../lib/windows/pthreads/lib/pthreadGC2.dll']
+ source = []
+
+ if env['WITH_BF_OPENMP']:
+ source += ['../lib/windows/pthreads/lib/pthreadGC2.dll']
+
scriptinstall.append(env.Install(dir=dir, source=source))
#-- plugins
@@ -577,45 +583,69 @@
else:
allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
-if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc'):
- if env['OURPLATFORM'] == 'win64-vc':
- dllsources = []
- else:
- dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll',
- '${BF_PNG_LIBPATH}/libpng.dll',
- '${BF_ZLIB_LIBPATH}/zlib.dll',
- '${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
- dllsources += ['${BF_PTHREADS_LIBPATH}/${BF_PTHREADS_LIB}.dll']
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
+ dllsources = []
+
+ if not env['OURPLATFORM'] in ('win32-mingw', 'win64-vc', 'linuxcross'):
+ # For MinGW and linuxcross static linking will be used
+ dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll']
+
+ #currently win64-vc doesn't appear to have libpng.dll
+ if env['OURPLATFORM'] != 'win64-vc':
+ dllsources += ['${BF_PNG_LIBPATH}/libpng.dll',
+ '${BF_ZLIB_LIBPATH}/zlib.dll']
+
+ dllsources += ['${BF_TIFF_LIBPATH}/${BF_TIFF_LIB}.dll']
+
+ if env['OURPLATFORM'] != 'linuxcross':
+ # pthreads library is already added
+ dllsources += ['${BF_PTHREADS_LIBPATH}/${BF_PTHREADS_LIB}.dll']
+
if env['WITH_BF_SDL']:
if env['OURPLATFORM'] == 'win64-vc':
pass # we link statically already to SDL on win64
else:
dllsources.append('${BF_SDL_LIBPATH}/SDL.dll')
+
if env['WITH_BF_PYTHON']:
if env['BF_DEBUG']:
dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}_d.dll')
else:
dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_DLL}.dll')
+
if env['WITH_BF_ICONV']:
if env['OURPLATFORM'] == 'win64-vc':
pass # we link statically to iconv on win64
- else:
+ elif not env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'):
+ #gettext for MinGW and cross-compilation is compiled staticly
dllsources += ['${BF_ICONV_LIBPATH}/iconv.dll']
+
if env['WITH_BF_OPENAL']:
dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll')
dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll')
+
if env['WITH_BF_SNDFILE']:
dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll')
+
if env['WITH_BF_FFMPEG']:
- dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-52.dll',
- '${LCGDIR}/ffmpeg/lib/avformat-52.dll',
- '${LCGDIR}/ffmpeg/lib/avdevice-52.dll',
- '${LCGDIR}/ffmpeg/lib/avutil-50.dll',
- '${LCGDIR}/ffmpeg/lib/swscale-0.dll',
- '${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
- '${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
- '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
- '${LCGDIR}/ffmpeg/lib/libx264-67.dll']
+ dllsources += ['${BF_FFMPEG_LIBPATH}/avcodec-52.dll',
+ '${BF_FFMPEG_LIBPATH}/avformat-52.dll',
+ '${BF_FFMPEG_LIBPATH}/avdevice-52.dll',
+ '${BF_FFMPEG_LIBPATH}/avutil-50.dll',
+ '${BF_FFMPEG_LIBPATH}/swscale-0.dll']
+
+ if env['OURPLATFORM'] != 'linuxcross':
+ #
+ # TODO: Does it mean we haven't got support of this codecs if
+ # we're using cross-compilation?
+ # Or in case of native compilation this libraries are
+ # unneccessary to?
+ #
+ dllsources += ['${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
+ '${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
+ '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
+ '${LCGDIR}/ffmpeg/lib/libx264-67.dll']
+
if env['WITH_BF_JACK']:
dllsources += ['${LCGDIR}/jack/lib/libjack.dll']
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
Modified: branches/render25/config/darwin-config.py
===================================================================
--- branches/render25/config/darwin-config.py 2010-02-10 14:52:02 UTC (rev 26769)
+++ branches/render25/config/darwin-config.py 2010-02-10 14:54:38 UTC (rev 26770)
@@ -73,6 +73,12 @@
################### Dependency settings ##################
#############################################################################
+#Defaults openMP to true if compiler (currently only gcc 4.2) handles it
+if CC == 'gcc-4.2':
+ WITH_BF_OPENMP = True # multithreading for fluids, cloth and smoke
+else:
+ WITH_BF_OPENMP = False
+
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
FFMPEG_PRECOMPILED = True
@@ -120,8 +126,6 @@
BF_PYTHON_LINKFLAGS = ['-u', '__dummy']+BF_PYTHON_LINKFLAGS
-WITH_BF_OPENMP = '0' # multithreading for fluids, cloth and smoke ( only works with ICC atm )
-
WITH_BF_OPENAL = True
#different lib must be used following version of gcc
# for gcc 3.3
@@ -264,7 +268,7 @@
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_LIB = 'OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2 buffer ftoa'
BF_OPENCOLLADA_LIBPATH = LIBDIR + '/opencollada'
BF_PCRE = LIBDIR + '/opencollada'
BF_PCRE_LIB = 'pcre'
@@ -274,7 +278,10 @@
#BF_EXPAT_LIBPATH = '/usr/lib'
#Ray trace optimization
-WITH_BF_RAYOPTIMIZATION = False
+if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
+ WITH_BF_RAYOPTIMIZATION = True
+else:
+ WITH_BF_RAYOPTIMIZATION = False
if MACOSX_ARCHITECTURE == 'i386':
BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
elif MACOSX_ARCHITECTURE == 'x86_64':
@@ -324,10 +331,11 @@
PLATFORM_LINKFLAGS = ['-mmacosx-version-min='+MAC_MIN_VERS,'-Wl','-isysroot',MACOSX_SDK,'-arch',MACOSX_ARCHITECTURE]+PLATFORM_LINKFLAGS
CCFLAGS=SDK_FLAGS+CCFLAGS
CXXFLAGS=SDK_FLAGS+CXXFLAGS
-
+
+#Intel Macs are CoreDuo and Up
if MACOSX_ARCHITECTURE == 'i386' or MACOSX_ARCHITECTURE == 'x86_64':
- REL_CFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3']
- REL_CCFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3']
+ REL_CFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3','-mfpmath=sse']
+ REL_CCFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3','-mfpmath=sse']
else:
CFLAGS = CFLAGS+['-fno-strict-aliasing']
CCFLAGS = CCFLAGS+['-fno-strict-aliasing']
@@ -335,20 +343,14 @@
REL_CFLAGS = ['-O2']
REL_CCFLAGS = ['-O2']
-# add -mssse3 for intel 64bit archs
+# Intel 64bit Macs are Core2Duo and up
if MACOSX_ARCHITECTURE == 'x86_64':
- REL_CFLAGS = REL_CFLAGS+['-mssse3']
- REL_CCFLAGS = REL_CCFLAGS+['-mssse3']
+ REL_CFLAGS = REL_CFLAGS+['-march=core2','-mssse3','-with-tune=core2','-enable-threads']
+ REL_CCFLAGS = REL_CCFLAGS+['-march=core2','-mssse3','-with-tune=core2','-enable-threads']
-##BF_DEPEND = True
-##
-##AR = ar
-##ARFLAGS = ruv
-##ARFLAGSQUIET = ru
-##
-#C_WARN = ['-Wdeclaration-after-statement']
-
CC_WARN = ['-Wall']
+C_WARN = ['-Wno-char-subscripts', '-Wpointer-arith', '-Wcast-align', '-Wdeclaration-after-statement', '-Wno-unknown-pragmas']
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list