[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12296] branches/cloth/blender: svn merge -r 12208:12294 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Daniel Genrich
daniel.genrich at gmx.net
Fri Oct 19 01:27:32 CEST 2007
Revision: 12296
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12296
Author: genscher
Date: 2007-10-19 01:27:31 +0200 (Fri, 19 Oct 2007)
Log Message:
-----------
svn merge -r 12208:12294 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/cloth/blender/extern/ffmpeg/SConscript
branches/cloth/blender/release/Makefile
branches/cloth/blender/release/scripts/scripttemplate_pyconstraint.py
branches/cloth/blender/source/blender/blenkernel/BKE_armature.h
branches/cloth/blender/source/blender/blenkernel/BKE_blender.h
branches/cloth/blender/source/blender/blenkernel/BKE_constraint.h
branches/cloth/blender/source/blender/blenkernel/intern/action.c
branches/cloth/blender/source/blender/blenkernel/intern/armature.c
branches/cloth/blender/source/blender/blenkernel/intern/constraint.c
branches/cloth/blender/source/blender/blenkernel/intern/depsgraph.c
branches/cloth/blender/source/blender/blenkernel/intern/modifier.c
branches/cloth/blender/source/blender/blenkernel/intern/object.c
branches/cloth/blender/source/blender/blenkernel/intern/softbody.c
branches/cloth/blender/source/blender/blenloader/intern/readfile.c
branches/cloth/blender/source/blender/imbuf/IMB_imbuf.h
branches/cloth/blender/source/blender/imbuf/intern/dds/BlockDXT.h
branches/cloth/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/cloth/blender/source/blender/imbuf/intern/dds/Stream.cpp
branches/cloth/blender/source/blender/imbuf/intern/dds/Stream.h
branches/cloth/blender/source/blender/imbuf/intern/dds/dds_api.cpp
branches/cloth/blender/source/blender/imbuf/intern/rotate.c
branches/cloth/blender/source/blender/include/BIF_editmesh.h
branches/cloth/blender/source/blender/include/BIF_editseq.h
branches/cloth/blender/source/blender/include/BIF_editsima.h
branches/cloth/blender/source/blender/include/BSE_sequence.h
branches/cloth/blender/source/blender/include/BSE_time.h
branches/cloth/blender/source/blender/include/BSE_view.h
branches/cloth/blender/source/blender/include/editmesh.h
branches/cloth/blender/source/blender/include/mydevice.h
branches/cloth/blender/source/blender/makesdna/DNA_armature_types.h
branches/cloth/blender/source/blender/makesdna/DNA_scene_types.h
branches/cloth/blender/source/blender/makesdna/DNA_sequence_types.h
branches/cloth/blender/source/blender/makesdna/DNA_space_types.h
branches/cloth/blender/source/blender/makesdna/DNA_userdef_types.h
branches/cloth/blender/source/blender/python/BPY_interface.c
branches/cloth/blender/source/blender/python/api2_2x/BGL.c
branches/cloth/blender/source/blender/python/api2_2x/Mesh.c
branches/cloth/blender/source/blender/python/api2_2x/doc/BGL.py
branches/cloth/blender/source/blender/python/api2_2x/sceneSequence.c
branches/cloth/blender/source/blender/render/intern/source/rayshade.c
branches/cloth/blender/source/blender/src/booleanops.c
branches/cloth/blender/source/blender/src/buttons_editing.c
branches/cloth/blender/source/blender/src/drawaction.c
branches/cloth/blender/source/blender/src/drawarmature.c
branches/cloth/blender/source/blender/src/drawipo.c
branches/cloth/blender/source/blender/src/drawmesh.c
branches/cloth/blender/source/blender/src/drawnla.c
branches/cloth/blender/source/blender/src/drawnode.c
branches/cloth/blender/source/blender/src/drawseq.c
branches/cloth/blender/source/blender/src/drawsound.c
branches/cloth/blender/source/blender/src/drawtime.c
branches/cloth/blender/source/blender/src/drawview.c
branches/cloth/blender/source/blender/src/editaction.c
branches/cloth/blender/source/blender/src/editipo.c
branches/cloth/blender/source/blender/src/editmesh_add.c
branches/cloth/blender/source/blender/src/editmesh_mods.c
branches/cloth/blender/source/blender/src/editmesh_tools.c
branches/cloth/blender/source/blender/src/editnla.c
branches/cloth/blender/source/blender/src/editobject.c
branches/cloth/blender/source/blender/src/editseq.c
branches/cloth/blender/source/blender/src/editsima.c
branches/cloth/blender/source/blender/src/editsound.c
branches/cloth/blender/source/blender/src/edittime.c
branches/cloth/blender/source/blender/src/editview.c
branches/cloth/blender/source/blender/src/header_action.c
branches/cloth/blender/source/blender/src/header_ipo.c
branches/cloth/blender/source/blender/src/header_nla.c
branches/cloth/blender/source/blender/src/header_seq.c
branches/cloth/blender/source/blender/src/header_sound.c
branches/cloth/blender/source/blender/src/header_view3d.c
branches/cloth/blender/source/blender/src/imagepaint.c
branches/cloth/blender/source/blender/src/interface.c
branches/cloth/blender/source/blender/src/sequence.c
branches/cloth/blender/source/blender/src/space.c
branches/cloth/blender/source/blender/src/toets.c
branches/cloth/blender/source/blender/src/toolbox.c
branches/cloth/blender/source/blender/src/transform.c
branches/cloth/blender/source/blender/src/transform_constraints.c
branches/cloth/blender/source/blender/src/transform_conversions.c
branches/cloth/blender/source/blender/src/transform_generics.c
branches/cloth/blender/source/blender/src/view.c
Added Paths:
-----------
branches/cloth/blender/extern/ffmpeg/patches/
branches/cloth/blender/extern/ffmpeg/patches/README
branches/cloth/blender/extern/ffmpeg/patches/ffmpeg_accel_bgra32.patch
branches/cloth/blender/extern/qdune/
branches/cloth/blender/extern/qdune/README.txt
branches/cloth/blender/extern/qdune/SConstruct
branches/cloth/blender/extern/qdune/ccdata50.dat
branches/cloth/blender/extern/qdune/ccdata50NT.dat
branches/cloth/blender/extern/qdune/core/
branches/cloth/blender/extern/qdune/core/Attributes.cpp
branches/cloth/blender/extern/qdune/core/Attributes.h
branches/cloth/blender/extern/qdune/core/Bound.cpp
branches/cloth/blender/extern/qdune/core/Bound.h
branches/cloth/blender/extern/qdune/core/Camera.cpp
branches/cloth/blender/extern/qdune/core/Camera.h
branches/cloth/blender/extern/qdune/core/Color.cpp
branches/cloth/blender/extern/qdune/core/Color.h
branches/cloth/blender/extern/qdune/core/HierarchicalZbuffer.cpp
branches/cloth/blender/extern/qdune/core/HierarchicalZbuffer.h
branches/cloth/blender/extern/qdune/core/Mathutil.cpp
branches/cloth/blender/extern/qdune/core/Mathutil.h
branches/cloth/blender/extern/qdune/core/Noise.cpp
branches/cloth/blender/extern/qdune/core/Noise.h
branches/cloth/blender/extern/qdune/core/Options.cpp
branches/cloth/blender/extern/qdune/core/Options.h
branches/cloth/blender/extern/qdune/core/QDRender.h
branches/cloth/blender/extern/qdune/core/RenderBucket.cpp
branches/cloth/blender/extern/qdune/core/RenderBucket.h
branches/cloth/blender/extern/qdune/core/State.cpp
branches/cloth/blender/extern/qdune/core/State.h
branches/cloth/blender/extern/qdune/core/Transform.cpp
branches/cloth/blender/extern/qdune/core/Transform.h
branches/cloth/blender/extern/qdune/core/mcqmc.h
branches/cloth/blender/extern/qdune/core/qdVector.cpp
branches/cloth/blender/extern/qdune/core/qdVector.h
branches/cloth/blender/extern/qdune/framebuffer/
branches/cloth/blender/extern/qdune/framebuffer/FrameBuffer.cpp
branches/cloth/blender/extern/qdune/framebuffer/FrameBuffer.h
branches/cloth/blender/extern/qdune/framework/
branches/cloth/blender/extern/qdune/framework/Framework.h
branches/cloth/blender/extern/qdune/framework/HybridFramework.cpp
branches/cloth/blender/extern/qdune/framework/HybridFramework.h
branches/cloth/blender/extern/qdune/framework/RayTraceFramework.cpp
branches/cloth/blender/extern/qdune/framework/RayTraceFramework.h
branches/cloth/blender/extern/qdune/framework/ReyesFramework.cpp
branches/cloth/blender/extern/qdune/framework/ReyesFramework.h
branches/cloth/blender/extern/qdune/hider/
branches/cloth/blender/extern/qdune/hider/Hider.h
branches/cloth/blender/extern/qdune/hider/RayTraceHider.cpp
branches/cloth/blender/extern/qdune/hider/RayTraceHider.h
branches/cloth/blender/extern/qdune/hider/ZbufferHider.cpp
branches/cloth/blender/extern/qdune/hider/ZbufferHider.h
branches/cloth/blender/extern/qdune/imgio/
branches/cloth/blender/extern/qdune/imgio/exr_io.cpp
branches/cloth/blender/extern/qdune/imgio/exr_io.h
branches/cloth/blender/extern/qdune/imgio/img_io.h
branches/cloth/blender/extern/qdune/imgio/jpeg_img.cpp
branches/cloth/blender/extern/qdune/imgio/jpeg_img.h
branches/cloth/blender/extern/qdune/mktex.cpp
branches/cloth/blender/extern/qdune/mpgrid/
branches/cloth/blender/extern/qdune/mpgrid/MicroPolygon.cpp
branches/cloth/blender/extern/qdune/mpgrid/MicroPolygon.h
branches/cloth/blender/extern/qdune/mpgrid/MicroPolygonGrid.cpp
branches/cloth/blender/extern/qdune/mpgrid/MicroPolygonGrid.h
branches/cloth/blender/extern/qdune/primitives/
branches/cloth/blender/extern/qdune/primitives/CCSubdivision.cpp
branches/cloth/blender/extern/qdune/primitives/CCSubdivision.h
branches/cloth/blender/extern/qdune/primitives/Curves.cpp
branches/cloth/blender/extern/qdune/primitives/Curves.h
branches/cloth/blender/extern/qdune/primitives/Nurbs.cpp
branches/cloth/blender/extern/qdune/primitives/Nurbs.h
branches/cloth/blender/extern/qdune/primitives/Parametric.cpp
branches/cloth/blender/extern/qdune/primitives/Parametric.h
branches/cloth/blender/extern/qdune/primitives/Patches.cpp
branches/cloth/blender/extern/qdune/primitives/Patches.h
branches/cloth/blender/extern/qdune/primitives/Points.cpp
branches/cloth/blender/extern/qdune/primitives/Points.h
branches/cloth/blender/extern/qdune/primitives/Polygons.cpp
branches/cloth/blender/extern/qdune/primitives/Polygons.h
branches/cloth/blender/extern/qdune/primitives/Primitive.cpp
branches/cloth/blender/extern/qdune/primitives/Primitive.h
branches/cloth/blender/extern/qdune/primitives/Quadrics.cpp
branches/cloth/blender/extern/qdune/primitives/Quadrics.h
branches/cloth/blender/extern/qdune/qdrender.cpp
branches/cloth/blender/extern/qdune/qdtl/
branches/cloth/blender/extern/qdune/qdtl/boolarray.h
branches/cloth/blender/extern/qdune/qdtl/lrulist.h
branches/cloth/blender/extern/qdune/qdtl/qdtl.cpp
branches/cloth/blender/extern/qdune/qdtl/qdtl.h
branches/cloth/blender/extern/qdune/ribparse/
branches/cloth/blender/extern/qdune/ribparse/RIB_parser.cpp
branches/cloth/blender/extern/qdune/ribparse/RIB_parser.h
branches/cloth/blender/extern/qdune/ribparse/decparam.cpp
branches/cloth/blender/extern/qdune/ribparse/decparam.h
branches/cloth/blender/extern/qdune/ribparse/ri.cpp
branches/cloth/blender/extern/qdune/ribparse/ri.h
branches/cloth/blender/extern/qdune/ribparse/ribInterface.cpp
branches/cloth/blender/extern/qdune/ribparse/ribInterface.h
branches/cloth/blender/extern/qdune/ribs/
branches/cloth/blender/extern/qdune/ribs/blsuz.rib
branches/cloth/blender/extern/qdune/ribs/curvetest2.rib
branches/cloth/blender/extern/qdune/ribs/fig12.10.rib
branches/cloth/blender/extern/qdune/ribs/fig12.12.rib
branches/cloth/blender/extern/qdune/ribs/fig12.14.rib
branches/cloth/blender/extern/qdune/ribs/gumbo.rib
branches/cloth/blender/extern/qdune/ribs/mblurtest.rib
branches/cloth/blender/extern/qdune/ribs/nonmanifold.rib
branches/cloth/blender/extern/qdune/ribs/suzanne.rib
branches/cloth/blender/extern/qdune/ribs/suzanne_pp.rib
branches/cloth/blender/extern/qdune/ribs/suzgallery.rib
branches/cloth/blender/extern/qdune/ribs/teapot.rib
branches/cloth/blender/extern/qdune/ribs/vase.rib
branches/cloth/blender/extern/qdune/shaders/
branches/cloth/blender/extern/qdune/shaders/SHW_velvet.sqd
branches/cloth/blender/extern/qdune/shaders/SIG2k_srf_fur.sqd
branches/cloth/blender/extern/qdune/shaders/ambientlight.sqd
branches/cloth/blender/extern/qdune/shaders/brushedmetal.sqd
branches/cloth/blender/extern/qdune/shaders/bumptest.sqd
branches/cloth/blender/extern/qdune/shaders/bumpy.sqd
branches/cloth/blender/extern/qdune/shaders/bumpy_surface.sqd
branches/cloth/blender/extern/qdune/shaders/castucco.sqd
branches/cloth/blender/extern/qdune/shaders/ceramictiles.sqd
branches/cloth/blender/extern/qdune/shaders/chebo.sqd
branches/cloth/blender/extern/qdune/shaders/chebo2.sqd
branches/cloth/blender/extern/qdune/shaders/chebo2D.sqd
branches/cloth/blender/extern/qdune/shaders/clay.sqd
branches/cloth/blender/extern/qdune/shaders/colorgrid.sqd
branches/cloth/blender/extern/qdune/shaders/constadd.sqd
branches/cloth/blender/extern/qdune/shaders/constant.sqd
branches/cloth/blender/extern/qdune/shaders/constvary.sqd
branches/cloth/blender/extern/qdune/shaders/dented.sqd
branches/cloth/blender/extern/qdune/shaders/distantlight.sqd
branches/cloth/blender/extern/qdune/shaders/dstex.sqd
branches/cloth/blender/extern/qdune/shaders/fog.sqd
branches/cloth/blender/extern/qdune/shaders/funkyglass.sqd
branches/cloth/blender/extern/qdune/shaders/glossy.sqd
branches/cloth/blender/extern/qdune/shaders/glow.sqd
branches/cloth/blender/extern/qdune/shaders/greenmarble.sqd
branches/cloth/blender/extern/qdune/shaders/hair.sqd
branches/cloth/blender/extern/qdune/shaders/hair_hw.sqd
branches/cloth/blender/extern/qdune/shaders/hypertexture.sqd
branches/cloth/blender/extern/qdune/shaders/lensflare.sqd
branches/cloth/blender/extern/qdune/shaders/luna.sqd
branches/cloth/blender/extern/qdune/shaders/matte.sqd
branches/cloth/blender/extern/qdune/shaders/matte_hw.sqd
branches/cloth/blender/extern/qdune/shaders/matte_illum.sqd
branches/cloth/blender/extern/qdune/shaders/metal.sqd
branches/cloth/blender/extern/qdune/shaders/ndctest.sqd
branches/cloth/blender/extern/qdune/shaders/nizid.sqd
branches/cloth/blender/extern/qdune/shaders/normalshader.sqd
branches/cloth/blender/extern/qdune/shaders/oak.sqd
branches/cloth/blender/extern/qdune/shaders/oakplank.sqd
branches/cloth/blender/extern/qdune/shaders/paintedplastic.sqd
branches/cloth/blender/extern/qdune/shaders/planetatmo.sqd
branches/cloth/blender/extern/qdune/shaders/planetclouds.sqd
branches/cloth/blender/extern/qdune/shaders/plastic.sqd
branches/cloth/blender/extern/qdune/shaders/plastic_hw.sqd
branches/cloth/blender/extern/qdune/shaders/platlight.sqd
branches/cloth/blender/extern/qdune/shaders/pointlight.sqd
branches/cloth/blender/extern/qdune/shaders/roughmetal.sqd
branches/cloth/blender/extern/qdune/shaders/screen.sqd
branches/cloth/blender/extern/qdune/shaders/screen_aa.sqd
branches/cloth/blender/extern/qdune/shaders/shadowdistant.sqd
branches/cloth/blender/extern/qdune/shaders/shadowedclouds.sqd
branches/cloth/blender/extern/qdune/shaders/shadowspot.sqd
branches/cloth/blender/extern/qdune/shaders/skin.sqd
branches/cloth/blender/extern/qdune/shaders/smoke.sqd
branches/cloth/blender/extern/qdune/shaders/spotlight.sqd
branches/cloth/blender/extern/qdune/shaders/spotlight_hw.sqd
branches/cloth/blender/extern/qdune/shaders/st_shader.sqd
branches/cloth/blender/extern/qdune/shaders/starball.sqd
branches/cloth/blender/extern/qdune/shaders/starfield.sqd
branches/cloth/blender/extern/qdune/shaders/stucco.sqd
branches/cloth/blender/extern/qdune/shaders/terran.sqd
branches/cloth/blender/extern/qdune/shaders/uberlight.sqd
branches/cloth/blender/extern/qdune/shaders/veinedmarble.sqd
branches/cloth/blender/extern/qdune/shaders/wood2.sqd
branches/cloth/blender/extern/qdune/shaders/wood2_hw.sqd
branches/cloth/blender/extern/qdune/slcompiler/
branches/cloth/blender/extern/qdune/slcompiler/qdlex.py
branches/cloth/blender/extern/qdune/slcompiler/qdslc.py
branches/cloth/blender/extern/qdune/slcompiler/slcompile.py
branches/cloth/blender/extern/qdune/slcompiler/slprocedures.py
branches/cloth/blender/extern/qdune/svm/
branches/cloth/blender/extern/qdune/svm/ImageTextures.cpp
branches/cloth/blender/extern/qdune/svm/ImageTextures.h
branches/cloth/blender/extern/qdune/svm/TexCache.cpp
branches/cloth/blender/extern/qdune/svm/TexCache.h
branches/cloth/blender/extern/qdune/svm/maketexture.cpp
branches/cloth/blender/extern/qdune/svm/maketexture.h
branches/cloth/blender/extern/qdune/svm/shaderVM.cpp
branches/cloth/blender/extern/qdune/svm/shaderVM.h
branches/cloth/blender/extern/qdune/svm/slshader.cpp
branches/cloth/blender/extern/qdune/svm/slshader.h
Removed Paths:
-------------
branches/cloth/blender/extern/ffmpeg/patches/README
branches/cloth/blender/extern/ffmpeg/patches/ffmpeg_accel_bgra32.patch
branches/cloth/blender/extern/qdune/README.txt
branches/cloth/blender/extern/qdune/SConstruct
branches/cloth/blender/extern/qdune/ccdata50.dat
branches/cloth/blender/extern/qdune/ccdata50NT.dat
branches/cloth/blender/extern/qdune/core/
branches/cloth/blender/extern/qdune/core/Attributes.cpp
branches/cloth/blender/extern/qdune/core/Attributes.h
branches/cloth/blender/extern/qdune/core/Bound.cpp
branches/cloth/blender/extern/qdune/core/Bound.h
branches/cloth/blender/extern/qdune/core/Camera.cpp
branches/cloth/blender/extern/qdune/core/Camera.h
branches/cloth/blender/extern/qdune/core/Color.cpp
branches/cloth/blender/extern/qdune/core/Color.h
branches/cloth/blender/extern/qdune/core/HierarchicalZbuffer.cpp
branches/cloth/blender/extern/qdune/core/HierarchicalZbuffer.h
branches/cloth/blender/extern/qdune/core/Mathutil.cpp
branches/cloth/blender/extern/qdune/core/Mathutil.h
branches/cloth/blender/extern/qdune/core/Noise.cpp
branches/cloth/blender/extern/qdune/core/Noise.h
branches/cloth/blender/extern/qdune/core/Options.cpp
branches/cloth/blender/extern/qdune/core/Options.h
branches/cloth/blender/extern/qdune/core/QDRender.h
branches/cloth/blender/extern/qdune/core/RenderBucket.cpp
branches/cloth/blender/extern/qdune/core/RenderBucket.h
branches/cloth/blender/extern/qdune/core/State.cpp
branches/cloth/blender/extern/qdune/core/State.h
branches/cloth/blender/extern/qdune/core/Transform.cpp
branches/cloth/blender/extern/qdune/core/Transform.h
branches/cloth/blender/extern/qdune/core/mcqmc.h
branches/cloth/blender/extern/qdune/core/qdVector.cpp
branches/cloth/blender/extern/qdune/core/qdVector.h
branches/cloth/blender/extern/qdune/framebuffer/
branches/cloth/blender/extern/qdune/framebuffer/FrameBuffer.cpp
branches/cloth/blender/extern/qdune/framebuffer/FrameBuffer.h
branches/cloth/blender/extern/qdune/framework/
branches/cloth/blender/extern/qdune/framework/Framework.h
branches/cloth/blender/extern/qdune/framework/HybridFramework.cpp
branches/cloth/blender/extern/qdune/framework/HybridFramework.h
branches/cloth/blender/extern/qdune/framework/RayTraceFramework.cpp
branches/cloth/blender/extern/qdune/framework/RayTraceFramework.h
branches/cloth/blender/extern/qdune/framework/ReyesFramework.cpp
branches/cloth/blender/extern/qdune/framework/ReyesFramework.h
branches/cloth/blender/extern/qdune/hider/
branches/cloth/blender/extern/qdune/hider/Hider.h
branches/cloth/blender/extern/qdune/hider/RayTraceHider.cpp
branches/cloth/blender/extern/qdune/hider/RayTraceHider.h
branches/cloth/blender/extern/qdune/hider/ZbufferHider.cpp
branches/cloth/blender/extern/qdune/hider/ZbufferHider.h
branches/cloth/blender/extern/qdune/imgio/
branches/cloth/blender/extern/qdune/imgio/exr_io.cpp
branches/cloth/blender/extern/qdune/imgio/exr_io.h
branches/cloth/blender/extern/qdune/imgio/img_io.h
branches/cloth/blender/extern/qdune/imgio/jpeg_img.cpp
branches/cloth/blender/extern/qdune/imgio/jpeg_img.h
branches/cloth/blender/extern/qdune/mktex.cpp
branches/cloth/blender/extern/qdune/mpgrid/
branches/cloth/blender/extern/qdune/mpgrid/MicroPolygon.cpp
branches/cloth/blender/extern/qdune/mpgrid/MicroPolygon.h
branches/cloth/blender/extern/qdune/mpgrid/MicroPolygonGrid.cpp
branches/cloth/blender/extern/qdune/mpgrid/MicroPolygonGrid.h
branches/cloth/blender/extern/qdune/primitives/
branches/cloth/blender/extern/qdune/primitives/CCSubdivision.cpp
branches/cloth/blender/extern/qdune/primitives/CCSubdivision.h
branches/cloth/blender/extern/qdune/primitives/Curves.cpp
branches/cloth/blender/extern/qdune/primitives/Curves.h
branches/cloth/blender/extern/qdune/primitives/Nurbs.cpp
branches/cloth/blender/extern/qdune/primitives/Nurbs.h
branches/cloth/blender/extern/qdune/primitives/Parametric.cpp
branches/cloth/blender/extern/qdune/primitives/Parametric.h
branches/cloth/blender/extern/qdune/primitives/Patches.cpp
branches/cloth/blender/extern/qdune/primitives/Patches.h
branches/cloth/blender/extern/qdune/primitives/Points.cpp
branches/cloth/blender/extern/qdune/primitives/Points.h
branches/cloth/blender/extern/qdune/primitives/Polygons.cpp
branches/cloth/blender/extern/qdune/primitives/Polygons.h
branches/cloth/blender/extern/qdune/primitives/Primitive.cpp
branches/cloth/blender/extern/qdune/primitives/Primitive.h
branches/cloth/blender/extern/qdune/primitives/Quadrics.cpp
branches/cloth/blender/extern/qdune/primitives/Quadrics.h
branches/cloth/blender/extern/qdune/qdrender.cpp
branches/cloth/blender/extern/qdune/qdtl/
branches/cloth/blender/extern/qdune/qdtl/boolarray.h
branches/cloth/blender/extern/qdune/qdtl/lrulist.h
branches/cloth/blender/extern/qdune/qdtl/qdtl.cpp
branches/cloth/blender/extern/qdune/qdtl/qdtl.h
branches/cloth/blender/extern/qdune/ribparse/
branches/cloth/blender/extern/qdune/ribparse/RIB_parser.cpp
branches/cloth/blender/extern/qdune/ribparse/RIB_parser.h
branches/cloth/blender/extern/qdune/ribparse/decparam.cpp
branches/cloth/blender/extern/qdune/ribparse/decparam.h
branches/cloth/blender/extern/qdune/ribparse/ri.cpp
branches/cloth/blender/extern/qdune/ribparse/ri.h
branches/cloth/blender/extern/qdune/ribparse/ribInterface.cpp
branches/cloth/blender/extern/qdune/ribparse/ribInterface.h
branches/cloth/blender/extern/qdune/ribs/
branches/cloth/blender/extern/qdune/ribs/blsuz.rib
branches/cloth/blender/extern/qdune/ribs/curvetest2.rib
branches/cloth/blender/extern/qdune/ribs/fig12.10.rib
branches/cloth/blender/extern/qdune/ribs/fig12.12.rib
branches/cloth/blender/extern/qdune/ribs/fig12.14.rib
branches/cloth/blender/extern/qdune/ribs/gumbo.rib
branches/cloth/blender/extern/qdune/ribs/mblurtest.rib
branches/cloth/blender/extern/qdune/ribs/nonmanifold.rib
branches/cloth/blender/extern/qdune/ribs/suzanne.rib
branches/cloth/blender/extern/qdune/ribs/suzanne_pp.rib
branches/cloth/blender/extern/qdune/ribs/suzgallery.rib
branches/cloth/blender/extern/qdune/ribs/teapot.rib
branches/cloth/blender/extern/qdune/ribs/vase.rib
branches/cloth/blender/extern/qdune/shaders/
branches/cloth/blender/extern/qdune/shaders/SHW_velvet.sqd
branches/cloth/blender/extern/qdune/shaders/SIG2k_srf_fur.sqd
branches/cloth/blender/extern/qdune/shaders/ambientlight.sqd
branches/cloth/blender/extern/qdune/shaders/brushedmetal.sqd
branches/cloth/blender/extern/qdune/shaders/bumptest.sqd
branches/cloth/blender/extern/qdune/shaders/bumpy.sqd
branches/cloth/blender/extern/qdune/shaders/bumpy_surface.sqd
branches/cloth/blender/extern/qdune/shaders/castucco.sqd
branches/cloth/blender/extern/qdune/shaders/ceramictiles.sqd
branches/cloth/blender/extern/qdune/shaders/chebo.sqd
branches/cloth/blender/extern/qdune/shaders/chebo2.sqd
branches/cloth/blender/extern/qdune/shaders/chebo2D.sqd
branches/cloth/blender/extern/qdune/shaders/clay.sqd
branches/cloth/blender/extern/qdune/shaders/colorgrid.sqd
branches/cloth/blender/extern/qdune/shaders/constadd.sqd
branches/cloth/blender/extern/qdune/shaders/constant.sqd
branches/cloth/blender/extern/qdune/shaders/constvary.sqd
branches/cloth/blender/extern/qdune/shaders/dented.sqd
branches/cloth/blender/extern/qdune/shaders/distantlight.sqd
branches/cloth/blender/extern/qdune/shaders/dstex.sqd
branches/cloth/blender/extern/qdune/shaders/fog.sqd
branches/cloth/blender/extern/qdune/shaders/funkyglass.sqd
branches/cloth/blender/extern/qdune/shaders/glossy.sqd
branches/cloth/blender/extern/qdune/shaders/glow.sqd
branches/cloth/blender/extern/qdune/shaders/greenmarble.sqd
branches/cloth/blender/extern/qdune/shaders/hair.sqd
branches/cloth/blender/extern/qdune/shaders/hair_hw.sqd
branches/cloth/blender/extern/qdune/shaders/hypertexture.sqd
branches/cloth/blender/extern/qdune/shaders/lensflare.sqd
branches/cloth/blender/extern/qdune/shaders/luna.sqd
branches/cloth/blender/extern/qdune/shaders/matte.sqd
branches/cloth/blender/extern/qdune/shaders/matte_hw.sqd
branches/cloth/blender/extern/qdune/shaders/matte_illum.sqd
branches/cloth/blender/extern/qdune/shaders/metal.sqd
branches/cloth/blender/extern/qdune/shaders/ndctest.sqd
branches/cloth/blender/extern/qdune/shaders/nizid.sqd
branches/cloth/blender/extern/qdune/shaders/normalshader.sqd
branches/cloth/blender/extern/qdune/shaders/oak.sqd
branches/cloth/blender/extern/qdune/shaders/oakplank.sqd
branches/cloth/blender/extern/qdune/shaders/paintedplastic.sqd
branches/cloth/blender/extern/qdune/shaders/planetatmo.sqd
branches/cloth/blender/extern/qdune/shaders/planetclouds.sqd
branches/cloth/blender/extern/qdune/shaders/plastic.sqd
branches/cloth/blender/extern/qdune/shaders/plastic_hw.sqd
branches/cloth/blender/extern/qdune/shaders/platlight.sqd
branches/cloth/blender/extern/qdune/shaders/pointlight.sqd
branches/cloth/blender/extern/qdune/shaders/roughmetal.sqd
branches/cloth/blender/extern/qdune/shaders/screen.sqd
branches/cloth/blender/extern/qdune/shaders/screen_aa.sqd
branches/cloth/blender/extern/qdune/shaders/shadowdistant.sqd
branches/cloth/blender/extern/qdune/shaders/shadowedclouds.sqd
branches/cloth/blender/extern/qdune/shaders/shadowspot.sqd
branches/cloth/blender/extern/qdune/shaders/skin.sqd
branches/cloth/blender/extern/qdune/shaders/smoke.sqd
branches/cloth/blender/extern/qdune/shaders/spotlight.sqd
branches/cloth/blender/extern/qdune/shaders/spotlight_hw.sqd
branches/cloth/blender/extern/qdune/shaders/st_shader.sqd
branches/cloth/blender/extern/qdune/shaders/starball.sqd
branches/cloth/blender/extern/qdune/shaders/starfield.sqd
branches/cloth/blender/extern/qdune/shaders/stucco.sqd
branches/cloth/blender/extern/qdune/shaders/terran.sqd
branches/cloth/blender/extern/qdune/shaders/uberlight.sqd
branches/cloth/blender/extern/qdune/shaders/veinedmarble.sqd
branches/cloth/blender/extern/qdune/shaders/wood2.sqd
branches/cloth/blender/extern/qdune/shaders/wood2_hw.sqd
branches/cloth/blender/extern/qdune/slcompiler/
branches/cloth/blender/extern/qdune/slcompiler/qdlex.py
branches/cloth/blender/extern/qdune/slcompiler/qdslc.py
branches/cloth/blender/extern/qdune/slcompiler/slcompile.py
branches/cloth/blender/extern/qdune/slcompiler/slprocedures.py
branches/cloth/blender/extern/qdune/svm/
branches/cloth/blender/extern/qdune/svm/ImageTextures.cpp
branches/cloth/blender/extern/qdune/svm/ImageTextures.h
branches/cloth/blender/extern/qdune/svm/TexCache.cpp
branches/cloth/blender/extern/qdune/svm/TexCache.h
branches/cloth/blender/extern/qdune/svm/maketexture.cpp
branches/cloth/blender/extern/qdune/svm/maketexture.h
branches/cloth/blender/extern/qdune/svm/shaderVM.cpp
branches/cloth/blender/extern/qdune/svm/shaderVM.h
branches/cloth/blender/extern/qdune/svm/slshader.cpp
branches/cloth/blender/extern/qdune/svm/slshader.h
Modified: branches/cloth/blender/extern/ffmpeg/SConscript
===================================================================
--- branches/cloth/blender/extern/ffmpeg/SConscript 2007-10-18 23:12:30 UTC (rev 12295)
+++ branches/cloth/blender/extern/ffmpeg/SConscript 2007-10-18 23:27:31 UTC (rev 12296)
@@ -1,8 +1,15 @@
#!/usr/bin/python
+Import('env')
+
all_libs = ['libavformat', 'libavcodec', 'libswscale', 'libavutil']
root = "extern/ffmpeg"
+if env['OURPLATFORM'] == 'win32-mingw':
+ ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-network --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-pthreads"
+else:
+ ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-network --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-memalign-hack"
+
import sys
import os
import re
@@ -10,8 +17,6 @@
from sets import Set
-Import('env')
-
ff_env = env.Copy();
ff_env.Replace(CCFLAGS = '')
ff_env.Replace(BF_DEBUG_FLAGS = '')
@@ -85,7 +90,7 @@
if not os.path.isfile(root + "/config.mak"):
os.chdir(root);
- os.system('sh configure --disable-shared --enable-liba52bin --enable-gpl --disable-network --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-pthreads')
+ os.system('sh configure ' + ffmpeg_switches)
os.chdir("../..");
else:
print "(skipped, config.mak already exists)"
Copied: branches/cloth/blender/extern/ffmpeg/patches (from rev 12294, trunk/blender/extern/ffmpeg/patches)
Deleted: branches/cloth/blender/extern/ffmpeg/patches/README
===================================================================
--- trunk/blender/extern/ffmpeg/patches/README 2007-10-18 22:49:36 UTC (rev 12294)
+++ branches/cloth/blender/extern/ffmpeg/patches/README 2007-10-18 23:27:31 UTC (rev 12296)
@@ -1,8 +0,0 @@
-In this directory, I collect patches to FFMPEG, to make it
-work / faster with blender.
-
-Currently, there is only a small MMX acceleration for the
-YUV -> BGRA32
-transformation.
-
--- Peter
\ No newline at end of file
Copied: branches/cloth/blender/extern/ffmpeg/patches/README (from rev 12294, trunk/blender/extern/ffmpeg/patches/README)
===================================================================
--- branches/cloth/blender/extern/ffmpeg/patches/README (rev 0)
+++ branches/cloth/blender/extern/ffmpeg/patches/README 2007-10-18 23:27:31 UTC (rev 12296)
@@ -0,0 +1,8 @@
+In this directory, I collect patches to FFMPEG, to make it
+work / faster with blender.
+
+Currently, there is only a small MMX acceleration for the
+YUV -> BGRA32
+transformation.
+
+-- Peter
\ No newline at end of file
Deleted: branches/cloth/blender/extern/ffmpeg/patches/ffmpeg_accel_bgra32.patch
===================================================================
--- trunk/blender/extern/ffmpeg/patches/ffmpeg_accel_bgra32.patch 2007-10-18 22:49:36 UTC (rev 12294)
+++ branches/cloth/blender/extern/ffmpeg/patches/ffmpeg_accel_bgra32.patch 2007-10-18 23:27:31 UTC (rev 12296)
@@ -1,114 +0,0 @@
-Index: yuv2rgb.c
-===================================================================
---- yuv2rgb.c (revision 12118)
-+++ yuv2rgb.c (working copy)
-@@ -619,6 +619,7 @@
- #if defined(HAVE_MMX2) || defined(HAVE_MMX)
- if (c->flags & SWS_CPU_CAPS_MMX2){
- switch(c->dstFormat){
-+ case PIX_FMT_BGR32: return yuv420_bgr32_MMX2;
- case PIX_FMT_RGB32: return yuv420_rgb32_MMX2;
- case PIX_FMT_BGR24: return yuv420_rgb24_MMX2;
- case PIX_FMT_BGR565: return yuv420_rgb16_MMX2;
-@@ -627,6 +628,7 @@
- }
- if (c->flags & SWS_CPU_CAPS_MMX){
- switch(c->dstFormat){
-+ case PIX_FMT_BGR32: return yuv420_bgr32_MMX;
- case PIX_FMT_RGB32: return yuv420_rgb32_MMX;
- case PIX_FMT_BGR24: return yuv420_rgb24_MMX;
- case PIX_FMT_BGR565: return yuv420_rgb16_MMX;
-Index: yuv2rgb_template.c
-===================================================================
---- yuv2rgb_template.c (revision 12118)
-+++ yuv2rgb_template.c (working copy)
-@@ -536,3 +536,89 @@
- __asm__ __volatile__ (EMMS);
- return srcSliceH;
- }
-+
-+static inline int RENAME(yuv420_bgr32)(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
-+ int srcSliceH, uint8_t* dst[], int dstStride[]){
-+ int y, h_size;
-+
-+ if(c->srcFormat == PIX_FMT_YUV422P){
-+ srcStride[1] *= 2;
-+ srcStride[2] *= 2;
-+ }
-+
-+ h_size= (c->dstW+7)&~7;
-+ if(h_size*4 > FFABS(dstStride[0])) h_size-=8;
-+
-+ __asm__ __volatile__ ("pxor %mm4, %mm4;" /* zero mm4 */ );
-+
-+ for (y= 0; y<srcSliceH; y++ ) {
-+ uint8_t *_image = dst[0] + (y+srcSliceY)*dstStride[0];
-+ uint8_t *_py = src[0] + y*srcStride[0];
-+ uint8_t *_pu = src[1] + (y>>1)*srcStride[1];
-+ uint8_t *_pv = src[2] + (y>>1)*srcStride[2];
-+ long index= -h_size/2;
-+
-+ /* this mmx assembly code deals with SINGLE scan line at a time, it convert 8
-+ pixels in each iteration */
-+ __asm__ __volatile__ (
-+ /* load data for start of next scan line */
-+ "movd (%2, %0), %%mm0;" /* Load 4 Cb 00 00 00 00 u3 u2 u1 u0 */
-+ "movd (%3, %0), %%mm1;" /* Load 4 Cr 00 00 00 00 v3 v2 v1 v0 */
-+ "movq (%5, %0, 2), %%mm6;" /* Load 8 Y Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 */
-+ //".balign 16 \n\t"
-+ "1: \n\t"
-+YUV2RGB
-+ /* convert RGB plane to RGB packed format,
-+ mm0 -> B, mm1 -> R, mm2 -> G, mm3 -> 0,
-+ mm4 -> GB, mm5 -> AR pixel 4-7,
-+ mm6 -> GB, mm7 -> AR pixel 0-3 */
-+ "pxor %%mm3, %%mm3;" /* zero mm3 */
-+
-+ "movq %%mm1, %%mm6;" /* R7 R6 R5 R4 R3 R2 R1 R0 */
-+ "movq %%mm0, %%mm7;" /* B7 B6 B5 B4 B3 B2 B1 B0 */
-+
-+ "movq %%mm1, %%mm4;" /* R7 R6 R5 R4 R3 R2 R1 R0 */
-+ "movq %%mm0, %%mm5;" /* B7 B6 B5 B4 B3 B2 B1 B0 */
-+
-+ "punpcklbw %%mm2, %%mm6;" /* G3 R3 G2 R2 G1 R1 G0 R0 */
-+ "punpcklbw %%mm3, %%mm7;" /* 00 B3 00 B2 00 B1 00 B0 */
-+
-+ "punpcklwd %%mm7, %%mm6;" /* 00 B1 R1 G1 00 B0 R0 G0 */
-+ MOVNTQ " %%mm6, (%1);" /* Store ABGR1 ABGR0 */
-+
-+ "movq %%mm1, %%mm6;" /* R7 R6 R5 R4 R3 R2 R1 R0 */
-+ "punpcklbw %%mm2, %%mm6;" /* G3 R3 G2 R2 G1 R1 G0 R0 */
-+
-+ "punpckhwd %%mm7, %%mm6;" /* 00 B3 G3 R3 00 B2 R3 G2 */
-+ MOVNTQ " %%mm6, 8 (%1);" /* Store ABGR3 ABGR2 */
-+
-+ "punpckhbw %%mm2, %%mm4;" /* G7 R7 G6 R6 G5 R5 G4 R4 */
-+ "punpckhbw %%mm3, %%mm5;" /* 00 B7 00 B6 00 B5 00 B4 */
-+
-+ "punpcklwd %%mm5, %%mm4;" /* 00 B5 R5 G5 00 B4 R4 G4 */
-+ MOVNTQ " %%mm4, 16 (%1);" /* Store ABGR5 ABGR4 */
-+
-+ "movq %%mm1, %%mm4;" /* R7 R6 R5 R4 R3 R2 R1 R0 */
-+ "punpckhbw %%mm2, %%mm4;" /* G7 R7 G6 R6 G5 R5 G4 R4 */
-+
-+ "punpckhwd %%mm5, %%mm4;" /* 00 B7 G7 R7 00 B6 R6 G6 */
-+ MOVNTQ " %%mm4, 24 (%1);" /* Store ABGR7 ABGR6 */
-+
-+ "movd 4 (%2, %0), %%mm0;" /* Load 4 Cb 00 00 00 00 u3 u2 u1 u0 */
-+ "movd 4 (%3, %0), %%mm1;" /* Load 4 Cr 00 00 00 00 v3 v2 v1 v0 */
-+
-+ "pxor %%mm4, %%mm4;" /* zero mm4 */
-+ "movq 8 (%5, %0, 2), %%mm6;" /* Load 8 Y Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 */
-+
-+ "add $32, %1 \n\t"
-+ "add $4, %0 \n\t"
-+ " js 1b \n\t"
-+
-+ : "+r" (index), "+r" (_image)
-+ : "r" (_pu - index), "r" (_pv - index), "r"(&c->redDither), "r" (_py - 2*index)
-+ );
-+ }
-+
-+ __asm__ __volatile__ (EMMS);
-+ return srcSliceH;
-+}
Copied: branches/cloth/blender/extern/ffmpeg/patches/ffmpeg_accel_bgra32.patch (from rev 12294, trunk/blender/extern/ffmpeg/patches/ffmpeg_accel_bgra32.patch)
===================================================================
--- branches/cloth/blender/extern/ffmpeg/patches/ffmpeg_accel_bgra32.patch (rev 0)
+++ branches/cloth/blender/extern/ffmpeg/patches/ffmpeg_accel_bgra32.patch 2007-10-18 23:27:31 UTC (rev 12296)
@@ -0,0 +1,114 @@
+Index: yuv2rgb.c
+===================================================================
+--- yuv2rgb.c (revision 12118)
++++ yuv2rgb.c (working copy)
+@@ -619,6 +619,7 @@
+ #if defined(HAVE_MMX2) || defined(HAVE_MMX)
+ if (c->flags & SWS_CPU_CAPS_MMX2){
+ switch(c->dstFormat){
++ case PIX_FMT_BGR32: return yuv420_bgr32_MMX2;
+ case PIX_FMT_RGB32: return yuv420_rgb32_MMX2;
+ case PIX_FMT_BGR24: return yuv420_rgb24_MMX2;
+ case PIX_FMT_BGR565: return yuv420_rgb16_MMX2;
+@@ -627,6 +628,7 @@
+ }
+ if (c->flags & SWS_CPU_CAPS_MMX){
+ switch(c->dstFormat){
++ case PIX_FMT_BGR32: return yuv420_bgr32_MMX;
+ case PIX_FMT_RGB32: return yuv420_rgb32_MMX;
+ case PIX_FMT_BGR24: return yuv420_rgb24_MMX;
+ case PIX_FMT_BGR565: return yuv420_rgb16_MMX;
+Index: yuv2rgb_template.c
+===================================================================
+--- yuv2rgb_template.c (revision 12118)
++++ yuv2rgb_template.c (working copy)
+@@ -536,3 +536,89 @@
+ __asm__ __volatile__ (EMMS);
+ return srcSliceH;
+ }
++
++static inline int RENAME(yuv420_bgr32)(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY,
++ int srcSliceH, uint8_t* dst[], int dstStride[]){
++ int y, h_size;
++
++ if(c->srcFormat == PIX_FMT_YUV422P){
++ srcStride[1] *= 2;
++ srcStride[2] *= 2;
++ }
++
++ h_size= (c->dstW+7)&~7;
++ if(h_size*4 > FFABS(dstStride[0])) h_size-=8;
++
++ __asm__ __volatile__ ("pxor %mm4, %mm4;" /* zero mm4 */ );
++
++ for (y= 0; y<srcSliceH; y++ ) {
++ uint8_t *_image = dst[0] + (y+srcSliceY)*dstStride[0];
++ uint8_t *_py = src[0] + y*srcStride[0];
++ uint8_t *_pu = src[1] + (y>>1)*srcStride[1];
++ uint8_t *_pv = src[2] + (y>>1)*srcStride[2];
++ long index= -h_size/2;
++
++ /* this mmx assembly code deals with SINGLE scan line at a time, it convert 8
++ pixels in each iteration */
++ __asm__ __volatile__ (
++ /* load data for start of next scan line */
++ "movd (%2, %0), %%mm0;" /* Load 4 Cb 00 00 00 00 u3 u2 u1 u0 */
++ "movd (%3, %0), %%mm1;" /* Load 4 Cr 00 00 00 00 v3 v2 v1 v0 */
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list