[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12403] branches/particles: Merge from trunk: revisions 12134 - 12400
Janne Karhu
jhkarh at utu.fi
Fri Oct 26 13:07:56 CEST 2007
Revision: 12403
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12403
Author: jhk
Date: 2007-10-26 13:07:55 +0200 (Fri, 26 Oct 2007)
Log Message:
-----------
Merge from trunk: revisions 12134 - 12400
Modified Paths:
--------------
branches/particles/config/linux2-config.py
branches/particles/extern/SConscript
branches/particles/intern/bmfont/BMF_Api.h
branches/particles/intern/bmfont/intern/BMF_Api.cpp
branches/particles/intern/bmfont/intern/BMF_BitmapFont.cpp
branches/particles/intern/bmfont/intern/BMF_BitmapFont.h
branches/particles/intern/iksolver/extern/IK_solver.h
branches/particles/intern/iksolver/intern/IK_QJacobian.cpp
branches/particles/intern/iksolver/intern/IK_QJacobian.h
branches/particles/intern/iksolver/intern/IK_QJacobianSolver.cpp
branches/particles/intern/iksolver/intern/IK_QJacobianSolver.h
branches/particles/intern/iksolver/intern/IK_QSegment.cpp
branches/particles/intern/iksolver/intern/IK_QSegment.h
branches/particles/intern/iksolver/intern/IK_QTask.h
branches/particles/intern/iksolver/intern/IK_Solver.cpp
branches/particles/projectfiles/blender/src/BL_src.dsp
branches/particles/projectfiles/blender/src/BL_src_cre.dsp
branches/particles/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/particles/projectfiles_vc7/blender/src/BL_src.vcproj
branches/particles/projectfiles_vc7/blender/src/BL_src_cre.vcproj
branches/particles/release/Makefile
branches/particles/release/scripts/console.py
branches/particles/release/scripts/export_obj.py
branches/particles/release/scripts/mesh_unfolder.py
branches/particles/source/blender/avi/intern/options.c
branches/particles/source/blender/blenkernel/BKE_DerivedMesh.h
branches/particles/source/blender/blenkernel/BKE_action.h
branches/particles/source/blender/blenkernel/BKE_armature.h
branches/particles/source/blender/blenkernel/BKE_bad_level_calls.h
branches/particles/source/blender/blenkernel/BKE_blender.h
branches/particles/source/blender/blenkernel/BKE_constraint.h
branches/particles/source/blender/blenkernel/BKE_global.h
branches/particles/source/blender/blenkernel/BKE_image.h
branches/particles/source/blender/blenkernel/BKE_object.h
branches/particles/source/blender/blenkernel/CMakeLists.txt
branches/particles/source/blender/blenkernel/SConscript
branches/particles/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/particles/source/blender/blenkernel/intern/DerivedMesh.c
branches/particles/source/blender/blenkernel/intern/Makefile
branches/particles/source/blender/blenkernel/intern/action.c
branches/particles/source/blender/blenkernel/intern/armature.c
branches/particles/source/blender/blenkernel/intern/blender.c
branches/particles/source/blender/blenkernel/intern/constraint.c
branches/particles/source/blender/blenkernel/intern/depsgraph.c
branches/particles/source/blender/blenkernel/intern/image.c
branches/particles/source/blender/blenkernel/intern/mesh.c
branches/particles/source/blender/blenkernel/intern/modifier.c
branches/particles/source/blender/blenkernel/intern/object.c
branches/particles/source/blender/blenkernel/intern/scene.c
branches/particles/source/blender/blenkernel/intern/softbody.c
branches/particles/source/blender/blenkernel/intern/subsurf_ccg.c
branches/particles/source/blender/blenkernel/intern/writeavi.c
branches/particles/source/blender/blenkernel/intern/writeffmpeg.c
branches/particles/source/blender/blenlib/BLI_blenlib.h
branches/particles/source/blender/blenlib/BLI_editVert.h
branches/particles/source/blender/blenlib/intern/storage.c
branches/particles/source/blender/blenlib/intern/util.c
branches/particles/source/blender/blenloader/intern/readblenentry.c
branches/particles/source/blender/blenloader/intern/readfile.c
branches/particles/source/blender/blenloader/intern/writefile.c
branches/particles/source/blender/blenpluginapi/iff.h
branches/particles/source/blender/imbuf/IMB_imbuf.h
branches/particles/source/blender/imbuf/intern/IMB_imginfo.h
branches/particles/source/blender/imbuf/intern/dds/BlockDXT.h
branches/particles/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/particles/source/blender/imbuf/intern/dds/Stream.cpp
branches/particles/source/blender/imbuf/intern/dds/Stream.h
branches/particles/source/blender/imbuf/intern/dds/dds_api.cpp
branches/particles/source/blender/imbuf/intern/imginfo.c
branches/particles/source/blender/imbuf/intern/png.c
branches/particles/source/blender/imbuf/intern/rectop.c
branches/particles/source/blender/imbuf/intern/rotate.c
branches/particles/source/blender/imbuf/intern/thumbs.c
branches/particles/source/blender/include/BDR_editface.h
branches/particles/source/blender/include/BIF_drawimage.h
branches/particles/source/blender/include/BIF_drawseq.h
branches/particles/source/blender/include/BIF_editconstraint.h
branches/particles/source/blender/include/BIF_editmesh.h
branches/particles/source/blender/include/BIF_editseq.h
branches/particles/source/blender/include/BIF_editsima.h
branches/particles/source/blender/include/BIF_editsound.h
branches/particles/source/blender/include/BIF_space.h
branches/particles/source/blender/include/BIF_spacetypes.h
branches/particles/source/blender/include/BIF_usiblender.h
branches/particles/source/blender/include/BSE_editipo.h
branches/particles/source/blender/include/BSE_sequence.h
branches/particles/source/blender/include/BSE_time.h
branches/particles/source/blender/include/BSE_view.h
branches/particles/source/blender/include/blendef.h
branches/particles/source/blender/include/butspace.h
branches/particles/source/blender/include/editmesh.h
branches/particles/source/blender/include/mydevice.h
branches/particles/source/blender/include/transform.h
branches/particles/source/blender/makesdna/DNA_action_types.h
branches/particles/source/blender/makesdna/DNA_armature_types.h
branches/particles/source/blender/makesdna/DNA_constraint_types.h
branches/particles/source/blender/makesdna/DNA_object_types.h
branches/particles/source/blender/makesdna/DNA_scene_types.h
branches/particles/source/blender/makesdna/DNA_sequence_types.h
branches/particles/source/blender/makesdna/DNA_space_types.h
branches/particles/source/blender/makesdna/DNA_userdef_types.h
branches/particles/source/blender/makesdna/DNA_view3d_types.h
branches/particles/source/blender/makesdna/DNA_world_types.h
branches/particles/source/blender/makesdna/intern/makesdna.c
branches/particles/source/blender/python/BPY_extern.h
branches/particles/source/blender/python/BPY_interface.c
branches/particles/source/blender/python/api2_2x/Armature.c
branches/particles/source/blender/python/api2_2x/BGL.c
branches/particles/source/blender/python/api2_2x/Blender.c
branches/particles/source/blender/python/api2_2x/Bone.c
branches/particles/source/blender/python/api2_2x/Bone.h
branches/particles/source/blender/python/api2_2x/Constraint.c
branches/particles/source/blender/python/api2_2x/Mesh.c
branches/particles/source/blender/python/api2_2x/Modifier.c
branches/particles/source/blender/python/api2_2x/Pose.c
branches/particles/source/blender/python/api2_2x/Window.c
branches/particles/source/blender/python/api2_2x/doc/Armature.py
branches/particles/source/blender/python/api2_2x/doc/BGL.py
branches/particles/source/blender/python/api2_2x/doc/Constraint.py
branches/particles/source/blender/python/api2_2x/doc/Modifier.py
branches/particles/source/blender/python/api2_2x/doc/Pose.py
branches/particles/source/blender/python/api2_2x/doc/Window.py
branches/particles/source/blender/python/api2_2x/euler.c
branches/particles/source/blender/python/api2_2x/quat.c
branches/particles/source/blender/python/api2_2x/sceneRender.c
branches/particles/source/blender/python/api2_2x/sceneSequence.c
branches/particles/source/blender/python/api2_2x/vector.c
branches/particles/source/blender/python/api2_2x/windowTheme.c
branches/particles/source/blender/quicktime/apple/quicktime_export.c
branches/particles/source/blender/render/intern/source/rayshade.c
branches/particles/source/blender/src/CMakeLists.txt
branches/particles/source/blender/src/Makefile
branches/particles/source/blender/src/SConscript
branches/particles/source/blender/src/booleanops.c
branches/particles/source/blender/src/buttons_editing.c
branches/particles/source/blender/src/buttons_object.c
branches/particles/source/blender/src/buttons_scene.c
branches/particles/source/blender/src/buttons_shading.c
branches/particles/source/blender/src/drawaction.c
branches/particles/source/blender/src/drawarmature.c
branches/particles/source/blender/src/drawimage.c
branches/particles/source/blender/src/drawipo.c
branches/particles/source/blender/src/drawmesh.c
branches/particles/source/blender/src/drawnla.c
branches/particles/source/blender/src/drawnode.c
branches/particles/source/blender/src/drawobject.c
branches/particles/source/blender/src/drawseq.c
branches/particles/source/blender/src/drawsound.c
branches/particles/source/blender/src/drawtime.c
branches/particles/source/blender/src/drawview.c
branches/particles/source/blender/src/edit.c
branches/particles/source/blender/src/editaction.c
branches/particles/source/blender/src/editarmature.c
branches/particles/source/blender/src/editconstraint.c
branches/particles/source/blender/src/editcurve.c
branches/particles/source/blender/src/editface.c
branches/particles/source/blender/src/editimasel.c
branches/particles/source/blender/src/editipo.c
branches/particles/source/blender/src/editipo_mods.c
branches/particles/source/blender/src/editmesh.c
branches/particles/source/blender/src/editmesh_add.c
branches/particles/source/blender/src/editmesh_mods.c
branches/particles/source/blender/src/editmesh_tools.c
branches/particles/source/blender/src/editnla.c
branches/particles/source/blender/src/editobject.c
branches/particles/source/blender/src/editscreen.c
branches/particles/source/blender/src/editseq.c
branches/particles/source/blender/src/editsima.c
branches/particles/source/blender/src/editsound.c
branches/particles/source/blender/src/edittime.c
branches/particles/source/blender/src/editview.c
branches/particles/source/blender/src/filelist.c
branches/particles/source/blender/src/filesel.c
branches/particles/source/blender/src/hddaudio.c
branches/particles/source/blender/src/header_action.c
branches/particles/source/blender/src/header_filesel.c
branches/particles/source/blender/src/header_image.c
branches/particles/source/blender/src/header_imasel.c
branches/particles/source/blender/src/header_info.c
branches/particles/source/blender/src/header_ipo.c
branches/particles/source/blender/src/header_nla.c
branches/particles/source/blender/src/header_seq.c
branches/particles/source/blender/src/header_sound.c
branches/particles/source/blender/src/header_text.c
branches/particles/source/blender/src/header_time.c
branches/particles/source/blender/src/header_view3d.c
branches/particles/source/blender/src/headerbuttons.c
branches/particles/source/blender/src/imagepaint.c
branches/particles/source/blender/src/interface.c
branches/particles/source/blender/src/interface_draw.c
branches/particles/source/blender/src/interface_icons.c
branches/particles/source/blender/src/outliner.c
branches/particles/source/blender/src/poseobject.c
branches/particles/source/blender/src/resources.c
branches/particles/source/blender/src/seqaudio.c
branches/particles/source/blender/src/seqeffects.c
branches/particles/source/blender/src/sequence.c
branches/particles/source/blender/src/space.c
branches/particles/source/blender/src/spacetypes.c
branches/particles/source/blender/src/toets.c
branches/particles/source/blender/src/toolbox.c
branches/particles/source/blender/src/transform.c
branches/particles/source/blender/src/transform_constraints.c
branches/particles/source/blender/src/transform_conversions.c
branches/particles/source/blender/src/transform_generics.c
branches/particles/source/blender/src/transform_snap.c
branches/particles/source/blender/src/usiblender.c
branches/particles/source/blender/src/view.c
branches/particles/source/creator/creator.c
branches/particles/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/particles/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/particles/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/particles/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/particles/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/particles/source/gameengine/GamePlayer/common/GPC_RenderTools.h
branches/particles/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/particles/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/particles/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/particles/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/particles/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/particles/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/particles/source/nan_definitions.mk
Added Paths:
-----------
branches/particles/extern/ffmpeg/SConscript
branches/particles/extern/ffmpeg/patches/
branches/particles/extern/ffmpeg/patches/README
branches/particles/extern/ffmpeg/patches/ffmpeg_accel_bgra32.patch
branches/particles/extern/qdune/
branches/particles/extern/qdune/README.txt
branches/particles/extern/qdune/SConstruct
branches/particles/extern/qdune/ccdata50.dat
branches/particles/extern/qdune/ccdata50NT.dat
branches/particles/extern/qdune/core/
branches/particles/extern/qdune/core/Attributes.cpp
branches/particles/extern/qdune/core/Attributes.h
branches/particles/extern/qdune/core/Bound.cpp
branches/particles/extern/qdune/core/Bound.h
branches/particles/extern/qdune/core/Camera.cpp
branches/particles/extern/qdune/core/Camera.h
branches/particles/extern/qdune/core/Color.cpp
branches/particles/extern/qdune/core/Color.h
branches/particles/extern/qdune/core/HierarchicalZbuffer.cpp
branches/particles/extern/qdune/core/HierarchicalZbuffer.h
branches/particles/extern/qdune/core/Mathutil.cpp
branches/particles/extern/qdune/core/Mathutil.h
branches/particles/extern/qdune/core/Noise.cpp
branches/particles/extern/qdune/core/Noise.h
branches/particles/extern/qdune/core/Options.cpp
branches/particles/extern/qdune/core/Options.h
branches/particles/extern/qdune/core/QDRender.h
branches/particles/extern/qdune/core/RenderBucket.cpp
branches/particles/extern/qdune/core/RenderBucket.h
branches/particles/extern/qdune/core/State.cpp
branches/particles/extern/qdune/core/State.h
branches/particles/extern/qdune/core/Transform.cpp
branches/particles/extern/qdune/core/Transform.h
branches/particles/extern/qdune/core/mcqmc.h
branches/particles/extern/qdune/core/qdVector.cpp
branches/particles/extern/qdune/core/qdVector.h
branches/particles/extern/qdune/framebuffer/
branches/particles/extern/qdune/framebuffer/FrameBuffer.cpp
branches/particles/extern/qdune/framebuffer/FrameBuffer.h
branches/particles/extern/qdune/framework/
branches/particles/extern/qdune/framework/Framework.h
branches/particles/extern/qdune/framework/HybridFramework.cpp
branches/particles/extern/qdune/framework/HybridFramework.h
branches/particles/extern/qdune/framework/RayTraceFramework.cpp
branches/particles/extern/qdune/framework/RayTraceFramework.h
branches/particles/extern/qdune/framework/ReyesFramework.cpp
branches/particles/extern/qdune/framework/ReyesFramework.h
branches/particles/extern/qdune/hider/
branches/particles/extern/qdune/hider/Hider.h
branches/particles/extern/qdune/hider/RayTraceHider.cpp
branches/particles/extern/qdune/hider/RayTraceHider.h
branches/particles/extern/qdune/hider/ZbufferHider.cpp
branches/particles/extern/qdune/hider/ZbufferHider.h
branches/particles/extern/qdune/imgio/
branches/particles/extern/qdune/imgio/exr_io.cpp
branches/particles/extern/qdune/imgio/exr_io.h
branches/particles/extern/qdune/imgio/img_io.h
branches/particles/extern/qdune/imgio/jpeg_img.cpp
branches/particles/extern/qdune/imgio/jpeg_img.h
branches/particles/extern/qdune/mktex.cpp
branches/particles/extern/qdune/mpgrid/
branches/particles/extern/qdune/mpgrid/MicroPolygon.cpp
branches/particles/extern/qdune/mpgrid/MicroPolygon.h
branches/particles/extern/qdune/mpgrid/MicroPolygonGrid.cpp
branches/particles/extern/qdune/mpgrid/MicroPolygonGrid.h
branches/particles/extern/qdune/primitives/
branches/particles/extern/qdune/primitives/CCSubdivision.cpp
branches/particles/extern/qdune/primitives/CCSubdivision.h
branches/particles/extern/qdune/primitives/Curves.cpp
branches/particles/extern/qdune/primitives/Curves.h
branches/particles/extern/qdune/primitives/Nurbs.cpp
branches/particles/extern/qdune/primitives/Nurbs.h
branches/particles/extern/qdune/primitives/Parametric.cpp
branches/particles/extern/qdune/primitives/Parametric.h
branches/particles/extern/qdune/primitives/Patches.cpp
branches/particles/extern/qdune/primitives/Patches.h
branches/particles/extern/qdune/primitives/Points.cpp
branches/particles/extern/qdune/primitives/Points.h
branches/particles/extern/qdune/primitives/Polygons.cpp
branches/particles/extern/qdune/primitives/Polygons.h
branches/particles/extern/qdune/primitives/Primitive.cpp
branches/particles/extern/qdune/primitives/Primitive.h
branches/particles/extern/qdune/primitives/Quadrics.cpp
branches/particles/extern/qdune/primitives/Quadrics.h
branches/particles/extern/qdune/qdrender.cpp
branches/particles/extern/qdune/qdtl/
branches/particles/extern/qdune/qdtl/boolarray.h
branches/particles/extern/qdune/qdtl/lrulist.h
branches/particles/extern/qdune/qdtl/qdtl.cpp
branches/particles/extern/qdune/qdtl/qdtl.h
branches/particles/extern/qdune/ribparse/
branches/particles/extern/qdune/ribparse/RIB_parser.cpp
branches/particles/extern/qdune/ribparse/RIB_parser.h
branches/particles/extern/qdune/ribparse/decparam.cpp
branches/particles/extern/qdune/ribparse/decparam.h
branches/particles/extern/qdune/ribparse/ri.cpp
branches/particles/extern/qdune/ribparse/ri.h
branches/particles/extern/qdune/ribparse/ribInterface.cpp
branches/particles/extern/qdune/ribparse/ribInterface.h
branches/particles/extern/qdune/ribs/
branches/particles/extern/qdune/ribs/blsuz.rib
branches/particles/extern/qdune/ribs/curvetest2.rib
branches/particles/extern/qdune/ribs/fig12.10.rib
branches/particles/extern/qdune/ribs/fig12.12.rib
branches/particles/extern/qdune/ribs/fig12.14.rib
branches/particles/extern/qdune/ribs/gumbo.rib
branches/particles/extern/qdune/ribs/mblurtest.rib
branches/particles/extern/qdune/ribs/nonmanifold.rib
branches/particles/extern/qdune/ribs/suzanne.rib
branches/particles/extern/qdune/ribs/suzanne_pp.rib
branches/particles/extern/qdune/ribs/suzgallery.rib
branches/particles/extern/qdune/ribs/teapot.rib
branches/particles/extern/qdune/ribs/vase.rib
branches/particles/extern/qdune/shaders/
branches/particles/extern/qdune/shaders/SHW_velvet.sqd
branches/particles/extern/qdune/shaders/SIG2k_srf_fur.sqd
branches/particles/extern/qdune/shaders/ambientlight.sqd
branches/particles/extern/qdune/shaders/brushedmetal.sqd
branches/particles/extern/qdune/shaders/bumptest.sqd
branches/particles/extern/qdune/shaders/bumpy.sqd
branches/particles/extern/qdune/shaders/bumpy_surface.sqd
branches/particles/extern/qdune/shaders/castucco.sqd
branches/particles/extern/qdune/shaders/ceramictiles.sqd
branches/particles/extern/qdune/shaders/chebo.sqd
branches/particles/extern/qdune/shaders/chebo2.sqd
branches/particles/extern/qdune/shaders/chebo2D.sqd
branches/particles/extern/qdune/shaders/clay.sqd
branches/particles/extern/qdune/shaders/colorgrid.sqd
branches/particles/extern/qdune/shaders/constadd.sqd
branches/particles/extern/qdune/shaders/constant.sqd
branches/particles/extern/qdune/shaders/constvary.sqd
branches/particles/extern/qdune/shaders/dented.sqd
branches/particles/extern/qdune/shaders/distantlight.sqd
branches/particles/extern/qdune/shaders/dstex.sqd
branches/particles/extern/qdune/shaders/fog.sqd
branches/particles/extern/qdune/shaders/funkyglass.sqd
branches/particles/extern/qdune/shaders/glossy.sqd
branches/particles/extern/qdune/shaders/glow.sqd
branches/particles/extern/qdune/shaders/greenmarble.sqd
branches/particles/extern/qdune/shaders/hair.sqd
branches/particles/extern/qdune/shaders/hair_hw.sqd
branches/particles/extern/qdune/shaders/hypertexture.sqd
branches/particles/extern/qdune/shaders/lensflare.sqd
branches/particles/extern/qdune/shaders/luna.sqd
branches/particles/extern/qdune/shaders/matte.sqd
branches/particles/extern/qdune/shaders/matte_hw.sqd
branches/particles/extern/qdune/shaders/matte_illum.sqd
branches/particles/extern/qdune/shaders/metal.sqd
branches/particles/extern/qdune/shaders/ndctest.sqd
branches/particles/extern/qdune/shaders/nizid.sqd
branches/particles/extern/qdune/shaders/normalshader.sqd
branches/particles/extern/qdune/shaders/oak.sqd
branches/particles/extern/qdune/shaders/oakplank.sqd
branches/particles/extern/qdune/shaders/paintedplastic.sqd
branches/particles/extern/qdune/shaders/planetatmo.sqd
branches/particles/extern/qdune/shaders/planetclouds.sqd
branches/particles/extern/qdune/shaders/plastic.sqd
branches/particles/extern/qdune/shaders/plastic_hw.sqd
branches/particles/extern/qdune/shaders/platlight.sqd
branches/particles/extern/qdune/shaders/pointlight.sqd
branches/particles/extern/qdune/shaders/roughmetal.sqd
branches/particles/extern/qdune/shaders/screen.sqd
branches/particles/extern/qdune/shaders/screen_aa.sqd
branches/particles/extern/qdune/shaders/shadowdistant.sqd
branches/particles/extern/qdune/shaders/shadowedclouds.sqd
branches/particles/extern/qdune/shaders/shadowspot.sqd
branches/particles/extern/qdune/shaders/skin.sqd
branches/particles/extern/qdune/shaders/smoke.sqd
branches/particles/extern/qdune/shaders/spotlight.sqd
branches/particles/extern/qdune/shaders/spotlight_hw.sqd
branches/particles/extern/qdune/shaders/st_shader.sqd
branches/particles/extern/qdune/shaders/starball.sqd
branches/particles/extern/qdune/shaders/starfield.sqd
branches/particles/extern/qdune/shaders/stucco.sqd
branches/particles/extern/qdune/shaders/terran.sqd
branches/particles/extern/qdune/shaders/uberlight.sqd
branches/particles/extern/qdune/shaders/veinedmarble.sqd
branches/particles/extern/qdune/shaders/wood2.sqd
branches/particles/extern/qdune/shaders/wood2_hw.sqd
branches/particles/extern/qdune/slcompiler/
branches/particles/extern/qdune/slcompiler/qdlex.py
branches/particles/extern/qdune/slcompiler/qdslc.py
branches/particles/extern/qdune/slcompiler/slcompile.py
branches/particles/extern/qdune/slcompiler/slprocedures.py
branches/particles/extern/qdune/svm/
branches/particles/extern/qdune/svm/ImageTextures.cpp
branches/particles/extern/qdune/svm/ImageTextures.h
branches/particles/extern/qdune/svm/TexCache.cpp
branches/particles/extern/qdune/svm/TexCache.h
branches/particles/extern/qdune/svm/maketexture.cpp
branches/particles/extern/qdune/svm/maketexture.h
branches/particles/extern/qdune/svm/shaderVM.cpp
branches/particles/extern/qdune/svm/shaderVM.h
branches/particles/extern/qdune/svm/slshader.cpp
branches/particles/extern/qdune/svm/slshader.h
Removed Paths:
-------------
branches/particles/extern/ffmpeg/patches/README
branches/particles/extern/ffmpeg/patches/ffmpeg_accel_bgra32.patch
branches/particles/extern/qdune/README.txt
branches/particles/extern/qdune/SConstruct
branches/particles/extern/qdune/ccdata50.dat
branches/particles/extern/qdune/ccdata50NT.dat
branches/particles/extern/qdune/core/
branches/particles/extern/qdune/core/Attributes.cpp
branches/particles/extern/qdune/core/Attributes.h
branches/particles/extern/qdune/core/Bound.cpp
branches/particles/extern/qdune/core/Bound.h
branches/particles/extern/qdune/core/Camera.cpp
branches/particles/extern/qdune/core/Camera.h
branches/particles/extern/qdune/core/Color.cpp
branches/particles/extern/qdune/core/Color.h
branches/particles/extern/qdune/core/HierarchicalZbuffer.cpp
branches/particles/extern/qdune/core/HierarchicalZbuffer.h
branches/particles/extern/qdune/core/Mathutil.cpp
branches/particles/extern/qdune/core/Mathutil.h
branches/particles/extern/qdune/core/Noise.cpp
branches/particles/extern/qdune/core/Noise.h
branches/particles/extern/qdune/core/Options.cpp
branches/particles/extern/qdune/core/Options.h
branches/particles/extern/qdune/core/QDRender.h
branches/particles/extern/qdune/core/RenderBucket.cpp
branches/particles/extern/qdune/core/RenderBucket.h
branches/particles/extern/qdune/core/State.cpp
branches/particles/extern/qdune/core/State.h
branches/particles/extern/qdune/core/Transform.cpp
branches/particles/extern/qdune/core/Transform.h
branches/particles/extern/qdune/core/mcqmc.h
branches/particles/extern/qdune/core/qdVector.cpp
branches/particles/extern/qdune/core/qdVector.h
branches/particles/extern/qdune/framebuffer/
branches/particles/extern/qdune/framebuffer/FrameBuffer.cpp
branches/particles/extern/qdune/framebuffer/FrameBuffer.h
branches/particles/extern/qdune/framework/
branches/particles/extern/qdune/framework/Framework.h
branches/particles/extern/qdune/framework/HybridFramework.cpp
branches/particles/extern/qdune/framework/HybridFramework.h
branches/particles/extern/qdune/framework/RayTraceFramework.cpp
branches/particles/extern/qdune/framework/RayTraceFramework.h
branches/particles/extern/qdune/framework/ReyesFramework.cpp
branches/particles/extern/qdune/framework/ReyesFramework.h
branches/particles/extern/qdune/hider/
branches/particles/extern/qdune/hider/Hider.h
branches/particles/extern/qdune/hider/RayTraceHider.cpp
branches/particles/extern/qdune/hider/RayTraceHider.h
branches/particles/extern/qdune/hider/ZbufferHider.cpp
branches/particles/extern/qdune/hider/ZbufferHider.h
branches/particles/extern/qdune/imgio/
branches/particles/extern/qdune/imgio/exr_io.cpp
branches/particles/extern/qdune/imgio/exr_io.h
branches/particles/extern/qdune/imgio/img_io.h
branches/particles/extern/qdune/imgio/jpeg_img.cpp
branches/particles/extern/qdune/imgio/jpeg_img.h
branches/particles/extern/qdune/mktex.cpp
branches/particles/extern/qdune/mpgrid/
branches/particles/extern/qdune/mpgrid/MicroPolygon.cpp
branches/particles/extern/qdune/mpgrid/MicroPolygon.h
branches/particles/extern/qdune/mpgrid/MicroPolygonGrid.cpp
branches/particles/extern/qdune/mpgrid/MicroPolygonGrid.h
branches/particles/extern/qdune/primitives/
branches/particles/extern/qdune/primitives/CCSubdivision.cpp
branches/particles/extern/qdune/primitives/CCSubdivision.h
branches/particles/extern/qdune/primitives/Curves.cpp
branches/particles/extern/qdune/primitives/Curves.h
branches/particles/extern/qdune/primitives/Nurbs.cpp
branches/particles/extern/qdune/primitives/Nurbs.h
branches/particles/extern/qdune/primitives/Parametric.cpp
branches/particles/extern/qdune/primitives/Parametric.h
branches/particles/extern/qdune/primitives/Patches.cpp
branches/particles/extern/qdune/primitives/Patches.h
branches/particles/extern/qdune/primitives/Points.cpp
branches/particles/extern/qdune/primitives/Points.h
branches/particles/extern/qdune/primitives/Polygons.cpp
branches/particles/extern/qdune/primitives/Polygons.h
branches/particles/extern/qdune/primitives/Primitive.cpp
branches/particles/extern/qdune/primitives/Primitive.h
branches/particles/extern/qdune/primitives/Quadrics.cpp
branches/particles/extern/qdune/primitives/Quadrics.h
branches/particles/extern/qdune/qdrender.cpp
branches/particles/extern/qdune/qdtl/
branches/particles/extern/qdune/qdtl/boolarray.h
branches/particles/extern/qdune/qdtl/lrulist.h
branches/particles/extern/qdune/qdtl/qdtl.cpp
branches/particles/extern/qdune/qdtl/qdtl.h
branches/particles/extern/qdune/ribparse/
branches/particles/extern/qdune/ribparse/RIB_parser.cpp
branches/particles/extern/qdune/ribparse/RIB_parser.h
branches/particles/extern/qdune/ribparse/decparam.cpp
branches/particles/extern/qdune/ribparse/decparam.h
branches/particles/extern/qdune/ribparse/ri.cpp
branches/particles/extern/qdune/ribparse/ri.h
branches/particles/extern/qdune/ribparse/ribInterface.cpp
branches/particles/extern/qdune/ribparse/ribInterface.h
branches/particles/extern/qdune/ribs/
branches/particles/extern/qdune/ribs/blsuz.rib
branches/particles/extern/qdune/ribs/curvetest2.rib
branches/particles/extern/qdune/ribs/fig12.10.rib
branches/particles/extern/qdune/ribs/fig12.12.rib
branches/particles/extern/qdune/ribs/fig12.14.rib
branches/particles/extern/qdune/ribs/gumbo.rib
branches/particles/extern/qdune/ribs/mblurtest.rib
branches/particles/extern/qdune/ribs/nonmanifold.rib
branches/particles/extern/qdune/ribs/suzanne.rib
branches/particles/extern/qdune/ribs/suzanne_pp.rib
branches/particles/extern/qdune/ribs/suzgallery.rib
branches/particles/extern/qdune/ribs/teapot.rib
branches/particles/extern/qdune/ribs/vase.rib
branches/particles/extern/qdune/shaders/
branches/particles/extern/qdune/shaders/SHW_velvet.sqd
branches/particles/extern/qdune/shaders/SIG2k_srf_fur.sqd
branches/particles/extern/qdune/shaders/ambientlight.sqd
branches/particles/extern/qdune/shaders/brushedmetal.sqd
branches/particles/extern/qdune/shaders/bumptest.sqd
branches/particles/extern/qdune/shaders/bumpy.sqd
branches/particles/extern/qdune/shaders/bumpy_surface.sqd
branches/particles/extern/qdune/shaders/castucco.sqd
branches/particles/extern/qdune/shaders/ceramictiles.sqd
branches/particles/extern/qdune/shaders/chebo.sqd
branches/particles/extern/qdune/shaders/chebo2.sqd
branches/particles/extern/qdune/shaders/chebo2D.sqd
branches/particles/extern/qdune/shaders/clay.sqd
branches/particles/extern/qdune/shaders/colorgrid.sqd
branches/particles/extern/qdune/shaders/constadd.sqd
branches/particles/extern/qdune/shaders/constant.sqd
branches/particles/extern/qdune/shaders/constvary.sqd
branches/particles/extern/qdune/shaders/dented.sqd
branches/particles/extern/qdune/shaders/distantlight.sqd
branches/particles/extern/qdune/shaders/dstex.sqd
branches/particles/extern/qdune/shaders/fog.sqd
branches/particles/extern/qdune/shaders/funkyglass.sqd
branches/particles/extern/qdune/shaders/glossy.sqd
branches/particles/extern/qdune/shaders/glow.sqd
branches/particles/extern/qdune/shaders/greenmarble.sqd
branches/particles/extern/qdune/shaders/hair.sqd
branches/particles/extern/qdune/shaders/hair_hw.sqd
branches/particles/extern/qdune/shaders/hypertexture.sqd
branches/particles/extern/qdune/shaders/lensflare.sqd
branches/particles/extern/qdune/shaders/luna.sqd
branches/particles/extern/qdune/shaders/matte.sqd
branches/particles/extern/qdune/shaders/matte_hw.sqd
branches/particles/extern/qdune/shaders/matte_illum.sqd
branches/particles/extern/qdune/shaders/metal.sqd
branches/particles/extern/qdune/shaders/ndctest.sqd
branches/particles/extern/qdune/shaders/nizid.sqd
branches/particles/extern/qdune/shaders/normalshader.sqd
branches/particles/extern/qdune/shaders/oak.sqd
branches/particles/extern/qdune/shaders/oakplank.sqd
branches/particles/extern/qdune/shaders/paintedplastic.sqd
branches/particles/extern/qdune/shaders/planetatmo.sqd
branches/particles/extern/qdune/shaders/planetclouds.sqd
branches/particles/extern/qdune/shaders/plastic.sqd
branches/particles/extern/qdune/shaders/plastic_hw.sqd
branches/particles/extern/qdune/shaders/platlight.sqd
branches/particles/extern/qdune/shaders/pointlight.sqd
branches/particles/extern/qdune/shaders/roughmetal.sqd
branches/particles/extern/qdune/shaders/screen.sqd
branches/particles/extern/qdune/shaders/screen_aa.sqd
branches/particles/extern/qdune/shaders/shadowdistant.sqd
branches/particles/extern/qdune/shaders/shadowedclouds.sqd
branches/particles/extern/qdune/shaders/shadowspot.sqd
branches/particles/extern/qdune/shaders/skin.sqd
branches/particles/extern/qdune/shaders/smoke.sqd
branches/particles/extern/qdune/shaders/spotlight.sqd
branches/particles/extern/qdune/shaders/spotlight_hw.sqd
branches/particles/extern/qdune/shaders/st_shader.sqd
branches/particles/extern/qdune/shaders/starball.sqd
branches/particles/extern/qdune/shaders/starfield.sqd
branches/particles/extern/qdune/shaders/stucco.sqd
branches/particles/extern/qdune/shaders/terran.sqd
branches/particles/extern/qdune/shaders/uberlight.sqd
branches/particles/extern/qdune/shaders/veinedmarble.sqd
branches/particles/extern/qdune/shaders/wood2.sqd
branches/particles/extern/qdune/shaders/wood2_hw.sqd
branches/particles/extern/qdune/slcompiler/
branches/particles/extern/qdune/slcompiler/qdlex.py
branches/particles/extern/qdune/slcompiler/qdslc.py
branches/particles/extern/qdune/slcompiler/slcompile.py
branches/particles/extern/qdune/slcompiler/slprocedures.py
branches/particles/extern/qdune/svm/
branches/particles/extern/qdune/svm/ImageTextures.cpp
branches/particles/extern/qdune/svm/ImageTextures.h
branches/particles/extern/qdune/svm/TexCache.cpp
branches/particles/extern/qdune/svm/TexCache.h
branches/particles/extern/qdune/svm/maketexture.cpp
branches/particles/extern/qdune/svm/maketexture.h
branches/particles/extern/qdune/svm/shaderVM.cpp
branches/particles/extern/qdune/svm/shaderVM.h
branches/particles/extern/qdune/svm/slshader.cpp
branches/particles/extern/qdune/svm/slshader.h
Modified: branches/particles/config/linux2-config.py
===================================================================
--- branches/particles/config/linux2-config.py 2007-10-26 10:46:40 UTC (rev 12402)
+++ branches/particles/config/linux2-config.py 2007-10-26 11:07:55 UTC (rev 12403)
@@ -115,11 +115,14 @@
BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
# enable ffmpeg support
-WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG
-BF_FFMPEG = '/usr'
+WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG
+BF_FFMPEG = '#extern/ffmpeg'
+BF_FFMPEG_LIB = ''
+# Uncomment the following two lines to use system's ffmpeg
+# BF_FFMPEG = '/usr'
+# BF_FFMPEG_LIB = 'avformat avcodec swscale avutil'
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat avcodec swscale avutil'
# Mesa Libs should go here if your using them as well....
WITH_BF_STATICOPENGL = 'false'
Modified: branches/particles/extern/SConscript
===================================================================
--- branches/particles/extern/SConscript 2007-10-26 10:46:40 UTC (rev 12402)
+++ branches/particles/extern/SConscript 2007-10-26 11:07:55 UTC (rev 12403)
@@ -13,3 +13,6 @@
if env['WITH_BF_VERSE']:
SConscript(['verse/dist/SConstruct'])
+
+if env['WITH_BF_FFMPEG'] and env['BF_FFMPEG_LIB'] == '':
+ SConscript(['ffmpeg/SConscript']);
Copied: branches/particles/extern/ffmpeg/SConscript (from rev 12400, trunk/blender/extern/ffmpeg/SConscript)
===================================================================
--- branches/particles/extern/ffmpeg/SConscript (rev 0)
+++ branches/particles/extern/ffmpeg/SConscript 2007-10-26 11:07:55 UTC (rev 12403)
@@ -0,0 +1,150 @@
+#!/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
+import shutil
+
+from sets import Set
+
+ff_env = env.Copy();
+ff_env.Replace(CCFLAGS = '')
+ff_env.Replace(BF_DEBUG_FLAGS = '')
+
+makevardef = re.compile('^([a-zA-Z0-9_-]+)[ \t]*(\+?)=(.*)')
+makevarsubst = re.compile('\$\(([^\)]+)\)')
+makeifeq = re.compile('if(n?)eq \(([^,]*),([^\)]*)\)')
+
+def makeparseblock(fp, variables):
+ pendingline = ''
+ while 1:
+ line = fp.readline()
+ if pendingline:
+ line = pendingline + line
+ pendingline = ''
+ if not line:
+ return
+ if line.endswith('\\\n'):
+ pendingline = line[:-2]
+ continue
+
+ i = line.find('#')
+ if i >= 0:
+ line = line[:i]
+
+ iter = makevarsubst.finditer(line[:])
+ for obj in iter:
+ (name) = obj.group(1)
+ s = ""
+ if name in variables:
+ s = variables[name]
+ line = line.replace('$(' + name + ')', s)
+
+ matchobj = makevardef.match(line)
+ if matchobj:
+ (name, op, value) = matchobj.group(1, 2, 3)
+
+ value = value.rstrip()
+
+ if op == '+' and name in variables:
+ variables[name] += value
+ else:
+ variables[name] = value
+ continue
+ matchobj = makeifeq.match(line)
+ if matchobj:
+ (op, name1, name2) = matchobj.group(1, 2, 3)
+ if (op == '' and name1 == name2) or (op == 'n' and name1 != name2):
+ makeparseblock(fp, variables)
+ else:
+ tempvars = {}
+ makeparseblock(fp, tempvars)
+ continue
+ line = line.strip()
+ if line == 'endif':
+ return
+
+def getmakevars(filenames):
+ variables = { }
+ for filename in filenames:
+ fp = open(filename)
+ print "Processing makefile: " + filename
+ try:
+ makeparseblock(fp, variables)
+ finally:
+ fp.close()
+
+ return variables
+
+print "Configuring ffmpeg..."
+
+if not os.path.isfile(root + "/config.mak"):
+ os.chdir(root);
+ os.system('sh configure ' + ffmpeg_switches)
+ os.chdir("../..");
+else:
+ print "(skipped, config.mak already exists)"
+
+if not os.path.isdir(root + "/include"):
+ os.mkdir(root + "/include");
+if not os.path.isdir(root + "/include/ffmpeg"):
+ os.mkdir(root + "/include/ffmpeg");
+
+for lib in all_libs:
+ vars = getmakevars([root + '/config.mak', root + "/" + lib + '/Makefile'])
+ objs = ""
+ if "OBJS-yes" in vars:
+ objs += vars['OBJS-yes']
+ if "OBJS" in vars:
+ objs += vars['OBJS']
+
+ objs += " "
+ objs = objs.replace(".o ", ".c ")
+
+ asm_objs = ""
+ if "ASM_OBJS" in vars:
+ asm_objs += vars["ASM_OBJS"]
+
+ asm_objs += " "
+ asm_objs = asm_objs.replace(".o ", ".S ")
+
+ objs += asm_objs;
+
+ sources = list(Set(objs.split()))
+ sources = [lib + "/" + x for x in sources]
+
+ defs = "HAVE_AV_CONFIG_H _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _ISOC9X_SOURCE"
+ cflags = ""
+
+ if "CFLAGS" in vars:
+ cflags += " " + vars["CFLAGS"]
+ if "OPTFLAGS" in vars:
+ cflags += " " + vars["OPTFLAGS"]
+
+ headers = ""
+ if "HEADERS" in vars:
+ headers += vars["HEADERS"]
+
+ headers = headers.split()
+
+ for h in headers:
+ if not os.path.isfile(root + "/include/ffmpeg/" + h):
+ shutil.copyfile(root + "/" + lib + "/" + h,
+ root + "/include/ffmpeg/" + h)
+
+ ff_env.BlenderLib (libname="extern_" + lib, sources=sources,
+ includes=["."] + all_libs,
+ defines=Split(defs),
+ libtype=['core', 'intern', 'player'],
+ priority = [5, 5, 200],
+ compileflags = Split(cflags))
Copied: branches/particles/extern/ffmpeg/patches (from rev 12400, trunk/blender/extern/ffmpeg/patches)
Deleted: branches/particles/extern/ffmpeg/patches/README
===================================================================
--- trunk/blender/extern/ffmpeg/patches/README 2007-10-26 09:22:07 UTC (rev 12400)
+++ branches/particles/extern/ffmpeg/patches/README 2007-10-26 11:07:55 UTC (rev 12403)
@@ -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/particles/extern/ffmpeg/patches/README (from rev 12400, trunk/blender/extern/ffmpeg/patches/README)
===================================================================
--- branches/particles/extern/ffmpeg/patches/README (rev 0)
+++ branches/particles/extern/ffmpeg/patches/README 2007-10-26 11:07:55 UTC (rev 12403)
@@ -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/particles/extern/ffmpeg/patches/ffmpeg_accel_bgra32.patch
===================================================================
--- trunk/blender/extern/ffmpeg/patches/ffmpeg_accel_bgra32.patch 2007-10-26 09:22:07 UTC (rev 12400)
+++ branches/particles/extern/ffmpeg/patches/ffmpeg_accel_bgra32.patch 2007-10-26 11:07:55 UTC (rev 12403)
@@ -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 */
-+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list