[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13202] branches/soc-2007-joeedh: = Merge with trunk=
Joseph Eagar
joeedh at gmail.com
Fri Jan 11 06:39:44 CET 2008
Revision: 13202
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13202
Author: joeedh
Date: 2008-01-11 06:39:43 +0100 (Fri, 11 Jan 2008)
Log Message:
-----------
=Merge with trunk=
Merge with trunk at revision 13186.
Some notes:
* DSM buffer creation is now significantly slower. The bucketing code I had
didn't survive the dupliobject refactor. DSM needs bucketing because it has
to render in very small (32x32) tiles.
* I wasn't able to integrate the new strand renderer. The current way it does shadows
only delivers Z information, which isn't enough for DSM. I may need help with this.
* I did preserve my de-globalization of zbuf.c.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13186
Modified Paths:
--------------
branches/soc-2007-joeedh/SConstruct
branches/soc-2007-joeedh/config/win32-mingw-config.py
branches/soc-2007-joeedh/extern/bFTGL/include/FTGL.h
branches/soc-2007-joeedh/extern/bFTGL/src/Makefile
branches/soc-2007-joeedh/extern/ffmpeg/libswscale/swscale.c
branches/soc-2007-joeedh/extern/ffmpeg/patches/README
branches/soc-2007-joeedh/extern/verse/Makefile
branches/soc-2007-joeedh/intern/bmfont/intern/BMF_BitmapFont.cpp
branches/soc-2007-joeedh/intern/elbeem/intern/isosurface.cpp
branches/soc-2007-joeedh/intern/elbeem/intern/solver_adap.cpp
branches/soc-2007-joeedh/intern/elbeem/intern/solver_main.cpp
branches/soc-2007-joeedh/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2007-joeedh/intern/guardedalloc/intern/mallocn.c
branches/soc-2007-joeedh/intern/iksolver/intern/IK_QSegment.cpp
branches/soc-2007-joeedh/projectfiles_vc7/blender/blender.sln
branches/soc-2007-joeedh/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/blender/render/BRE_render.vcproj
branches/soc-2007-joeedh/projectfiles_vc7/blender/src/BL_src.vcproj
branches/soc-2007-joeedh/release/Makefile
branches/soc-2007-joeedh/release/datafiles/blenderbuttons
branches/soc-2007-joeedh/release/scripts/flt_export.py
branches/soc-2007-joeedh/release/scripts/flt_import.py
branches/soc-2007-joeedh/release/scripts/import_obj.py
branches/soc-2007-joeedh/release/scripts/ply_export.py
branches/soc-2007-joeedh/release/scripts/wizard_curve2tree.py
branches/soc-2007-joeedh/source/Makefile
branches/soc-2007-joeedh/source/blender/Makefile
branches/soc-2007-joeedh/source/blender/avi/intern/avi.c
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_anim.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_bad_level_calls.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_blender.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_constraint.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_dsm.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_image.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_ipo.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_mesh.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_modifier.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_node.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_particle.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_scene.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_softbody.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2007-joeedh/source/blender/blenkernel/SConscript
branches/soc-2007-joeedh/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/Makefile
branches/soc-2007-joeedh/source/blender/blenkernel/intern/action.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/anim.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/armature.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/colortools.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/constraint.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/curve.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/customdata.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/displist.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/image.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/ipo.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/lattice.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/material.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/mesh.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/modifier.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/node.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/object.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/particle.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/particle_system.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/scene.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/softbody.c
branches/soc-2007-joeedh/source/blender/blenlib/BLI_arithb.h
branches/soc-2007-joeedh/source/blender/blenlib/BLI_blenlib.h
branches/soc-2007-joeedh/source/blender/blenlib/BLI_boxpack2d.h
branches/soc-2007-joeedh/source/blender/blenlib/BLI_rand.h
branches/soc-2007-joeedh/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2007-joeedh/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2007-joeedh/source/blender/blenlib/intern/arithb.c
branches/soc-2007-joeedh/source/blender/blenlib/intern/rand.c
branches/soc-2007-joeedh/source/blender/blenlib/intern/util.c
branches/soc-2007-joeedh/source/blender/blenloader/intern/readfile.c
branches/soc-2007-joeedh/source/blender/blenloader/intern/writefile.c
branches/soc-2007-joeedh/source/blender/ftfont/intern/Makefile
branches/soc-2007-joeedh/source/blender/imbuf/intern/anim.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/BlockDXT.cpp
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/BlockDXT.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/ColorBlock.cpp
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/ColorBlock.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/Common.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/DirectDrawSurface.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/Image.cpp
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/Image.h
branches/soc-2007-joeedh/source/blender/imbuf/intern/filter.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/jpeg.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/rotate.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/thumbs.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/tiff.c
branches/soc-2007-joeedh/source/blender/include/BDR_editobject.h
branches/soc-2007-joeedh/source/blender/include/BDR_sculptmode.h
branches/soc-2007-joeedh/source/blender/include/BIF_butspace.h
branches/soc-2007-joeedh/source/blender/include/BIF_drawtext.h
branches/soc-2007-joeedh/source/blender/include/BIF_editaction.h
branches/soc-2007-joeedh/source/blender/include/BIF_editarmature.h
branches/soc-2007-joeedh/source/blender/include/BIF_editconstraint.h
branches/soc-2007-joeedh/source/blender/include/BIF_editparticle.h
branches/soc-2007-joeedh/source/blender/include/BIF_editseq.h
branches/soc-2007-joeedh/source/blender/include/BIF_gl.h
branches/soc-2007-joeedh/source/blender/include/BIF_interface.h
branches/soc-2007-joeedh/source/blender/include/BIF_poseobject.h
branches/soc-2007-joeedh/source/blender/include/BIF_resources.h
branches/soc-2007-joeedh/source/blender/include/BIF_space.h
branches/soc-2007-joeedh/source/blender/include/BSE_editipo.h
branches/soc-2007-joeedh/source/blender/include/BSE_node.h
branches/soc-2007-joeedh/source/blender/include/BSE_seqeffects.h
branches/soc-2007-joeedh/source/blender/include/BSE_sequence.h
branches/soc-2007-joeedh/source/blender/include/BSE_time.h
branches/soc-2007-joeedh/source/blender/include/blendef.h
branches/soc-2007-joeedh/source/blender/include/butspace.h
branches/soc-2007-joeedh/source/blender/include/multires.h
branches/soc-2007-joeedh/source/blender/include/transform.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_action_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_armature_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_listBase.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_material_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_nla_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_node_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_object_force.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_object_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_particle_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_scene_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_texture_types.h
branches/soc-2007-joeedh/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2007-joeedh/source/blender/nodes/CMP_node.h
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/Makefile
branches/soc-2007-joeedh/source/blender/nodes/intern/Makefile
branches/soc-2007-joeedh/source/blender/nodes/intern/SHD_nodes/Makefile
branches/soc-2007-joeedh/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
branches/soc-2007-joeedh/source/blender/python/BPY_interface.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Armature.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Blender.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/CurNurb.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Draw.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Geometry.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Image.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Key.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Lamp.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Mesh.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Modifier.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/NLA.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Object.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Scene.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Texture.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/Window.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/bpy_data.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Blender.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Modifier.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/NLA.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Object.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/Render.py
branches/soc-2007-joeedh/source/blender/python/api2_2x/sceneRender.c
branches/soc-2007-joeedh/source/blender/python/api2_2x/sceneSequence.c
branches/soc-2007-joeedh/source/blender/radiosity/intern/source/radfactors.c
branches/soc-2007-joeedh/source/blender/radiosity/intern/source/radrender.c
branches/soc-2007-joeedh/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2007-joeedh/source/blender/render/extern/include/RE_raytrace.h
branches/soc-2007-joeedh/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2007-joeedh/source/blender/render/intern/include/render_types.h
branches/soc-2007-joeedh/source/blender/render/intern/include/rendercore.h
branches/soc-2007-joeedh/source/blender/render/intern/include/renderdatabase.h
branches/soc-2007-joeedh/source/blender/render/intern/include/shadbuf.h
branches/soc-2007-joeedh/source/blender/render/intern/include/shading.h
branches/soc-2007-joeedh/source/blender/render/intern/include/zbuf.h
branches/soc-2007-joeedh/source/blender/render/intern/source/convertblender.c
branches/soc-2007-joeedh/source/blender/render/intern/source/dsm.c
branches/soc-2007-joeedh/source/blender/render/intern/source/envmap.c
branches/soc-2007-joeedh/source/blender/render/intern/source/imagetexture.c
branches/soc-2007-joeedh/source/blender/render/intern/source/pipeline.c
branches/soc-2007-joeedh/source/blender/render/intern/source/rayshade.c
branches/soc-2007-joeedh/source/blender/render/intern/source/raytrace.c
branches/soc-2007-joeedh/source/blender/render/intern/source/rendercore.c
branches/soc-2007-joeedh/source/blender/render/intern/source/renderdatabase.c
branches/soc-2007-joeedh/source/blender/render/intern/source/shadbuf.c
branches/soc-2007-joeedh/source/blender/render/intern/source/shadeinput.c
branches/soc-2007-joeedh/source/blender/render/intern/source/shadeoutput.c
branches/soc-2007-joeedh/source/blender/render/intern/source/sss.c
branches/soc-2007-joeedh/source/blender/render/intern/source/texture.c
branches/soc-2007-joeedh/source/blender/render/intern/source/zbuf.c
branches/soc-2007-joeedh/source/blender/src/blenderbuttons.c
branches/soc-2007-joeedh/source/blender/src/butspace.c
branches/soc-2007-joeedh/source/blender/src/buttons_editing.c
branches/soc-2007-joeedh/source/blender/src/buttons_object.c
branches/soc-2007-joeedh/source/blender/src/buttons_scene.c
branches/soc-2007-joeedh/source/blender/src/buttons_shading.c
branches/soc-2007-joeedh/source/blender/src/drawaction.c
branches/soc-2007-joeedh/source/blender/src/drawarmature.c
branches/soc-2007-joeedh/source/blender/src/drawimage.c
branches/soc-2007-joeedh/source/blender/src/drawimasel.c
branches/soc-2007-joeedh/source/blender/src/drawipo.c
branches/soc-2007-joeedh/source/blender/src/drawmesh.c
branches/soc-2007-joeedh/source/blender/src/drawnla.c
branches/soc-2007-joeedh/source/blender/src/drawnode.c
branches/soc-2007-joeedh/source/blender/src/drawobject.c
branches/soc-2007-joeedh/source/blender/src/drawseq.c
branches/soc-2007-joeedh/source/blender/src/drawsound.c
branches/soc-2007-joeedh/source/blender/src/drawtext.c
branches/soc-2007-joeedh/source/blender/src/drawtime.c
branches/soc-2007-joeedh/source/blender/src/drawview.c
branches/soc-2007-joeedh/source/blender/src/edit.c
branches/soc-2007-joeedh/source/blender/src/editaction.c
branches/soc-2007-joeedh/source/blender/src/editarmature.c
branches/soc-2007-joeedh/source/blender/src/editconstraint.c
branches/soc-2007-joeedh/source/blender/src/editcurve.c
branches/soc-2007-joeedh/source/blender/src/editface.c
branches/soc-2007-joeedh/source/blender/src/editfont.c
branches/soc-2007-joeedh/source/blender/src/editimasel.c
branches/soc-2007-joeedh/source/blender/src/editipo.c
branches/soc-2007-joeedh/source/blender/src/editipo_mods.c
branches/soc-2007-joeedh/source/blender/src/editlattice.c
branches/soc-2007-joeedh/source/blender/src/editmball.c
branches/soc-2007-joeedh/source/blender/src/editmesh.c
branches/soc-2007-joeedh/source/blender/src/editmesh_mods.c
branches/soc-2007-joeedh/source/blender/src/editnla.c
branches/soc-2007-joeedh/source/blender/src/editnode.c
branches/soc-2007-joeedh/source/blender/src/editobject.c
branches/soc-2007-joeedh/source/blender/src/editparticle.c
branches/soc-2007-joeedh/source/blender/src/editscreen.c
branches/soc-2007-joeedh/source/blender/src/editseq.c
branches/soc-2007-joeedh/source/blender/src/editsima.c
branches/soc-2007-joeedh/source/blender/src/editsound.c
branches/soc-2007-joeedh/source/blender/src/edittime.c
branches/soc-2007-joeedh/source/blender/src/editview.c
branches/soc-2007-joeedh/source/blender/src/filesel.c
branches/soc-2007-joeedh/source/blender/src/header_action.c
branches/soc-2007-joeedh/source/blender/src/header_buttonswin.c
branches/soc-2007-joeedh/source/blender/src/header_info.c
branches/soc-2007-joeedh/source/blender/src/header_nla.c
branches/soc-2007-joeedh/source/blender/src/header_node.c
branches/soc-2007-joeedh/source/blender/src/header_seq.c
branches/soc-2007-joeedh/source/blender/src/header_text.c
branches/soc-2007-joeedh/source/blender/src/header_time.c
branches/soc-2007-joeedh/source/blender/src/header_view3d.c
branches/soc-2007-joeedh/source/blender/src/headerbuttons.c
branches/soc-2007-joeedh/source/blender/src/interface.c
branches/soc-2007-joeedh/source/blender/src/language.c
branches/soc-2007-joeedh/source/blender/src/meshlaplacian.c
branches/soc-2007-joeedh/source/blender/src/meshtools.c
branches/soc-2007-joeedh/source/blender/src/multires.c
branches/soc-2007-joeedh/source/blender/src/outliner.c
branches/soc-2007-joeedh/source/blender/src/playanim.c
branches/soc-2007-joeedh/source/blender/src/poseobject.c
branches/soc-2007-joeedh/source/blender/src/renderwin.c
branches/soc-2007-joeedh/source/blender/src/resources.c
branches/soc-2007-joeedh/source/blender/src/retopo.c
branches/soc-2007-joeedh/source/blender/src/sculptmode-stroke.c
branches/soc-2007-joeedh/source/blender/src/sculptmode.c
branches/soc-2007-joeedh/source/blender/src/seqaudio.c
branches/soc-2007-joeedh/source/blender/src/seqeffects.c
branches/soc-2007-joeedh/source/blender/src/sequence.c
branches/soc-2007-joeedh/source/blender/src/space.c
branches/soc-2007-joeedh/source/blender/src/toets.c
branches/soc-2007-joeedh/source/blender/src/toolbox.c
branches/soc-2007-joeedh/source/blender/src/transform.c
branches/soc-2007-joeedh/source/blender/src/transform_conversions.c
branches/soc-2007-joeedh/source/blender/src/transform_generics.c
branches/soc-2007-joeedh/source/blender/src/transform_manipulator.c
branches/soc-2007-joeedh/source/blender/src/transform_snap.c
branches/soc-2007-joeedh/source/blender/src/usiblender.c
branches/soc-2007-joeedh/source/blender/src/verse_object.c
branches/soc-2007-joeedh/source/blender/src/view.c
branches/soc-2007-joeedh/source/blender/src/vpaint.c
branches/soc-2007-joeedh/source/blender/src/writeimage.c
branches/soc-2007-joeedh/source/blender/yafray/YafRay_Api.h
branches/soc-2007-joeedh/source/blender/yafray/intern/api.cpp
branches/soc-2007-joeedh/source/blender/yafray/intern/export_File.cpp
branches/soc-2007-joeedh/source/blender/yafray/intern/export_Plugin.cpp
branches/soc-2007-joeedh/source/blender/yafray/intern/yafray_Render.cpp
branches/soc-2007-joeedh/source/blender/yafray/intern/yafray_Render.h
branches/soc-2007-joeedh/source/creator/creator.c
branches/soc-2007-joeedh/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2007-joeedh/source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
branches/soc-2007-joeedh/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2007-joeedh/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2007-joeedh/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2007-joeedh/source/nan_compile.mk
branches/soc-2007-joeedh/source/nan_definitions.mk
branches/soc-2007-joeedh/source/nan_link.mk
branches/soc-2007-joeedh/source/tools/guess/guessconfig
branches/soc-2007-joeedh/tools/Blender.py
branches/soc-2007-joeedh/tools/btools.py
Added Paths:
-----------
branches/soc-2007-joeedh/extern/ffmpeg/patches/swscale_stride_bugfix.patch
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_multires.h
branches/soc-2007-joeedh/source/blender/blenkernel/BKE_sculpt.h
branches/soc-2007-joeedh/source/blender/blenkernel/intern/multires-firstlevel.c
branches/soc-2007-joeedh/source/blender/blenkernel/intern/multires.c
branches/soc-2007-joeedh/source/blender/blenlib/BLI_bpath.h
branches/soc-2007-joeedh/source/blender/blenlib/intern/bpath.c
branches/soc-2007-joeedh/source/blender/imbuf/intern/dds/PixelFormat.h
branches/soc-2007-joeedh/source/blender/include/BIF_poselib.h
branches/soc-2007-joeedh/source/blender/include/reeb.h
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_bilateralblur.c
branches/soc-2007-joeedh/source/blender/nodes/intern/CMP_nodes/CMP_directionalblur.c
branches/soc-2007-joeedh/source/blender/render/intern/source/strand.c
branches/soc-2007-joeedh/source/blender/src/poselib.c
branches/soc-2007-joeedh/source/blender/src/reeb.c
Removed Paths:
-------------
branches/soc-2007-joeedh/release/scripts/image_find_paths.py
branches/soc-2007-joeedh/source/blender/src/multires-firstlevel.c
Property Changed:
----------------
branches/soc-2007-joeedh/source/blender/python/api2_2x/doc/pupblock.blend
branches/soc-2007-joeedh/source/tools/guess/config.guess
branches/soc-2007-joeedh/source/tools/guess/guessconfig
Modified: branches/soc-2007-joeedh/SConstruct
===================================================================
--- branches/soc-2007-joeedh/SConstruct 2008-01-10 23:06:55 UTC (rev 13201)
+++ branches/soc-2007-joeedh/SConstruct 2008-01-11 05:39:43 UTC (rev 13202)
@@ -170,6 +170,9 @@
opts = btools.read_opts(optfiles, B.arguments)
opts.Update(env)
+if not env['BF_FANCY']:
+ B.bc.disable()
+
# disable elbeem (fluidsim) compilation?
if env['BF_NO_ELBEEM'] == 1:
env['CPPFLAGS'].append('-DDISABLE_ELBEEM')
Modified: branches/soc-2007-joeedh/config/win32-mingw-config.py
===================================================================
--- branches/soc-2007-joeedh/config/win32-mingw-config.py 2008-01-10 23:06:55 UTC (rev 13201)
+++ branches/soc-2007-joeedh/config/win32-mingw-config.py 2008-01-11 05:39:43 UTC (rev 13202)
@@ -18,7 +18,7 @@
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
WITH_BF_FFMPEG = 'false'
-BF_FFMPEG_LIB = 'avformat avutil avcodec'
+BF_FFMPEG_LIB = 'avformat swscale avcodec avutil xvidcore x264'
BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib'
BF_FFMPEG_INC = LIBDIR + '/gcc/ffmpeg/include'
Modified: branches/soc-2007-joeedh/extern/bFTGL/include/FTGL.h
===================================================================
--- branches/soc-2007-joeedh/extern/bFTGL/include/FTGL.h 2008-01-10 23:06:55 UTC (rev 13201)
+++ branches/soc-2007-joeedh/extern/bFTGL/include/FTGL.h 2008-01-11 05:39:43 UTC (rev 13202)
@@ -42,7 +42,11 @@
#include <OpenGL/glu.h>
#else
#include <GL/gl.h>
- #include <GL/glu.h>
+ #if defined (__sun__) && !defined (__sparc__)
+ #include <mesa/glu.h>
+ #else
+ #include <GL/glu.h>
+ #endif
#endif
#endif
Modified: branches/soc-2007-joeedh/extern/bFTGL/src/Makefile
===================================================================
--- branches/soc-2007-joeedh/extern/bFTGL/src/Makefile 2008-01-10 23:06:55 UTC (rev 13201)
+++ branches/soc-2007-joeedh/extern/bFTGL/src/Makefile 2008-01-11 05:39:43 UTC (rev 13202)
@@ -46,7 +46,8 @@
include nan_compile.mk
CPPFLAGS += -I../include
-CPPFLAGS += -I$(NAN_FREETYPE)/include -I$(NAN_FREETYPE)/include/freetype2
+CPPFLAGS += -I$(NAN_FREETYPE)/include -I$(NAN_FREETYPE)/include/freetype2
+CPPFLAGS += -I$(OPENGL_HEADERS)
install: all debug
@[ -d $(NAN_FTGL) ] || mkdir -p $(NAN_FTGL)
Modified: branches/soc-2007-joeedh/extern/ffmpeg/libswscale/swscale.c
===================================================================
--- branches/soc-2007-joeedh/extern/ffmpeg/libswscale/swscale.c 2008-01-10 23:06:55 UTC (rev 13201)
+++ branches/soc-2007-joeedh/extern/ffmpeg/libswscale/swscale.c 2008-01-11 05:39:43 UTC (rev 13202)
@@ -1678,7 +1678,7 @@
if(conv)
{
- if (dstStride[0]*srcBpp == srcStride[0]*dstBpp)
+ if (dstStride[0]*srcBpp == srcStride[0]*dstBpp && srcStride[0] > 0)
conv(src[0], dst[0] + dstStride[0]*srcSliceY, srcSliceH*srcStride[0]);
else
{
Modified: branches/soc-2007-joeedh/extern/ffmpeg/patches/README
===================================================================
--- branches/soc-2007-joeedh/extern/ffmpeg/patches/README 2008-01-10 23:06:55 UTC (rev 13201)
+++ branches/soc-2007-joeedh/extern/ffmpeg/patches/README 2008-01-11 05:39:43 UTC (rev 13202)
@@ -1,8 +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.
+Currently:
+- MMX acceleration for the YUV -> BGRA32 transformation.
+- Bugfix for swscale, that screwed up RGB -> RGB32 with RAW AVIs
-- Peter
\ No newline at end of file
Copied: branches/soc-2007-joeedh/extern/ffmpeg/patches/swscale_stride_bugfix.patch (from rev 13186, trunk/blender/extern/ffmpeg/patches/swscale_stride_bugfix.patch)
===================================================================
--- branches/soc-2007-joeedh/extern/ffmpeg/patches/swscale_stride_bugfix.patch (rev 0)
+++ branches/soc-2007-joeedh/extern/ffmpeg/patches/swscale_stride_bugfix.patch 2008-01-11 05:39:43 UTC (rev 13202)
@@ -0,0 +1,13 @@
+Index: swscale.c
+===================================================================
+--- swscale.c (revision 12850)
++++ swscale.c (working copy)
+@@ -1678,7 +1678,7 @@
+
+ if(conv)
+ {
+- if (dstStride[0]*srcBpp == srcStride[0]*dstBpp)
++ if (dstStride[0]*srcBpp == srcStride[0]*dstBpp && srcStride[0] > 0)
+ conv(src[0], dst[0] + dstStride[0]*srcSliceY, srcSliceH*srcStride[0]);
+ else
+ {
Modified: branches/soc-2007-joeedh/extern/verse/Makefile
===================================================================
--- branches/soc-2007-joeedh/extern/verse/Makefile 2008-01-10 23:06:55 UTC (rev 13201)
+++ branches/soc-2007-joeedh/extern/verse/Makefile 2008-01-11 05:39:43 UTC (rev 13202)
@@ -54,5 +54,5 @@
ifeq ($(OS),darwin)
ranlib $(NAN_VERSE)/lib/libverse.a
endif
- $(CCC) $(LDFLAGS) -o $(DIR)/verse$(EXT) $(DIR)/libverse.a $(LIBS) $(SLIBS) $(LLIBS) $(DADD) $(LOPTS)
+ $(CCC) $(CCFLAGS) $(LDFLAGS) -o $(DIR)/verse$(EXT) $(DIR)/libverse.a $(LIBS) $(SLIBS) $(LLIBS) $(DADD) $(LOPTS)
@$(CP) $(DIR)/verse$(EXT) $(OCGDIR)/bin
Modified: branches/soc-2007-joeedh/intern/bmfont/intern/BMF_BitmapFont.cpp
===================================================================
--- branches/soc-2007-joeedh/intern/bmfont/intern/BMF_BitmapFont.cpp 2008-01-10 23:06:55 UTC (rev 13201)
+++ branches/soc-2007-joeedh/intern/bmfont/intern/BMF_BitmapFont.cpp 2008-01-11 05:39:43 UTC (rev 13202)
@@ -291,20 +291,20 @@
if (fbuf) {
float *pixel, *max;
unsigned char c;
- int x, y;
+ int xi, yi;
max = fbuf + (4 * (w * h));
while ((c = (unsigned char) *str++)) {
BMF_CharData & cd = m_fontData->chars[c];
if (cd.data_offset != -1) {
- for (y = 0; y < cd.height; y++) {
- unsigned char* chrRow = &m_fontData->bitmap_data[cd.data_offset + ((cd.width+7)/8)*y];
- for (x = cd.xorig; x < cd.width; x++) {
- pixel = fbuf + 4 * (((posy + y - cd.yorig) * w) + (posx + x));
+ for (yi = 0; yi < cd.height; yi++) {
+ unsigned char* chrRow = &m_fontData->bitmap_data[cd.data_offset + ((cd.width+7)/8)*yi];
+ for (xi = cd.xorig; xi < cd.width; xi++) {
+ pixel = fbuf + 4 * (((posy + yi - cd.yorig) * w) + (posx + xi));
if ((pixel < max) && (pixel > fbuf)) {
- int byteIdx = x/8;
- int bitIdx = 7 - (x%8);
+ int byteIdx = xi/8;
+ int bitIdx = 7 - (xi%8);
if (chrRow[byteIdx]&(1<<bitIdx)) {
pixel[0] = col[0];
Modified: branches/soc-2007-joeedh/intern/elbeem/intern/isosurface.cpp
===================================================================
--- branches/soc-2007-joeedh/intern/elbeem/intern/isosurface.cpp 2008-01-10 23:06:55 UTC (rev 13201)
+++ branches/soc-2007-joeedh/intern/elbeem/intern/isosurface.cpp 2008-01-11 05:39:43 UTC (rev 13202)
@@ -13,11 +13,10 @@
#include <algorithm>
#include <stdio.h>
-#if !defined(linux) && (defined (__sparc) || defined (__sparc__))
+#if (defined (__sun__) || defined (__sun)) || (!defined(linux) && (defined (__sparc) || defined (__sparc__)))
#include <ieeefp.h>
#endif
-
// just use default rounding for platforms where its not available
#ifndef round
#define round(x) (x)
Modified: branches/soc-2007-joeedh/intern/elbeem/intern/solver_adap.cpp
===================================================================
--- branches/soc-2007-joeedh/intern/elbeem/intern/solver_adap.cpp 2008-01-10 23:06:55 UTC (rev 13201)
+++ branches/soc-2007-joeedh/intern/elbeem/intern/solver_adap.cpp 2008-01-11 05:39:43 UTC (rev 13202)
@@ -11,11 +11,10 @@
#include "solver_relax.h"
#include "particletracer.h"
-#if !defined(linux) && (defined (__sparc) || defined (__sparc__))
+#if (defined (__sun__) || defined (__sun)) || (!defined(linux) && (defined (__sparc) || defined (__sparc__)))
#include <ieeefp.h>
#endif
-
/*****************************************************************************/
//! coarse step functions
/*****************************************************************************/
Modified: branches/soc-2007-joeedh/intern/elbeem/intern/solver_main.cpp
===================================================================
--- branches/soc-2007-joeedh/intern/elbeem/intern/solver_main.cpp 2008-01-10 23:06:55 UTC (rev 13201)
+++ branches/soc-2007-joeedh/intern/elbeem/intern/solver_main.cpp 2008-01-11 05:39:43 UTC (rev 13202)
@@ -13,7 +13,7 @@
#include "loop_tools.h"
#include <stdlib.h>
-#if !defined(linux) && (defined (__sparc) || defined (__sparc__))
+#if (defined (__sun__) || defined (__sun)) || (!defined(linux) && (defined (__sparc) || defined (__sparc__)))
#include <ieeefp.h>
#endif
Modified: branches/soc-2007-joeedh/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- branches/soc-2007-joeedh/intern/guardedalloc/MEM_guardedalloc.h 2008-01-10 23:06:55 UTC (rev 13201)
+++ branches/soc-2007-joeedh/intern/guardedalloc/MEM_guardedalloc.h 2008-01-11 05:39:43 UTC (rev 13202)
@@ -76,9 +76,12 @@
/**
* Release memory previously allocatred by this module.
*/
+ short MEM_freeN(void *vmemh);
short WMEM_freeN(void *vmemh);
+
short _MEM_freeN(void *vmemh, char *file, int line);
#define MEM_freeN(vmemh) _MEM_freeN(vmemh, __FILE__, __LINE__)
+
/**
* Duplicates a block of memory, and returns a pointer to the
* newly allocated block. */
@@ -101,9 +104,13 @@
void *MEM_mapallocN(unsigned int len, const char * str);
/** Print a list of the names and sizes of all allocated memory
+ * blocks. as a python dict for easy investigation */
+ void MEM_printmemlist_pydict(void);
+
+ /** Print a list of the names and sizes of all allocated memory
* blocks. */
void MEM_printmemlist(void);
-
+
/** Set the callback function for error output. */
void MEM_set_error_callback(void (*func)(char *));
Modified: branches/soc-2007-joeedh/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2007-joeedh/intern/guardedalloc/intern/mallocn.c 2008-01-10 23:06:55 UTC (rev 13201)
+++ branches/soc-2007-joeedh/intern/guardedalloc/intern/mallocn.c 2008-01-11 05:39:43 UTC (rev 13202)
@@ -333,7 +333,8 @@
}
-void MEM_printmemlist()
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list