Blender Git Loki
Git Commits -> Revision 44906cd
Revision 44906cd by Brecht Van Lommel (render25) April 15, 2010, 15:49 (GMT) |
Render Branch: Imbuf module: some small refactoring and removing a lot of unused or old code (about 6.5k lines), it's a bit drastic but can add back if it's still useful. * Added a ImFileType struct with callbacks to make adding an file format type, or making changes to the API easier. * Move imbuf init/exit code into IMB_init()/IMB_exit() functions. * Increased mipmap levels from 10 to 20, you run into this limit already with a 2k image. * Removed hamx, amiga, anim5 format support. * Removed colormap saving, only simple colormap code now for reading tga. * Removed gen_dynlibtiff.py, editing this is almost as much work as just editing the code directly. * Functions removed that were only used for sequencer plugin API: IMB_anim_nextpic, IMB_clever_double, IMB_antialias, IMB_gamwarp, IMB_scalefieldImBuf, IMB_scalefastfieldImBuf, IMB_onethird, IMB_halflace, IMB_dit0, IMB_dit2, IMB_cspace Image textures can now lazely load mipmap levels from files, so if an object is far away only a lower level is loaded. This is supported for the .tx file format as used by prman, which is basically a tiff image with all the mipmap levels saved in it. I tested generating them using OpenImageIO maketx utility, (there is no way to save these from Blender currently). Added mipmap levels simplify option (couldn't think of a better name). This makes it possible to force using lower resolution mipmap levels, which helps reducing memory usage a lot when using .tx files. Next: tile loading support, then swapping them in and out with a cache. |
Commit Details:
Full Hash: 44906cd71538fcf43d1d47bbc3171dbc3359ce7e
SVN Revision: 28209
Parent Commit: 64a0da7
Lines Changed: +1227, -7469
5 Added Paths:
/source/blender/imbuf/intern/filetype.c (+105, -0) (View)
/source/blender/imbuf/intern/IMB_filetype.h (+113, -0) (View)
/source/blender/imbuf/intern/IMB_metadata.h (+85, -0) (View)
/source/blender/imbuf/intern/metadata.c (+159, -0) (View)
/source/blender/imbuf/intern/module.c (+38, -0) (View)
/source/blender/imbuf/intern/IMB_filetype.h (+113, -0) (View)
/source/blender/imbuf/intern/IMB_metadata.h (+85, -0) (View)
/source/blender/imbuf/intern/metadata.c (+159, -0) (View)
/source/blender/imbuf/intern/module.c (+38, -0) (View)
34 Deleted Paths:
/source/blender/imbuf/intern/amiga.c (+0, -540)
/source/blender/imbuf/intern/anim5.c (+0, -539)
/source/blender/imbuf/intern/antialias.c (+0, -466)
/source/blender/imbuf/intern/bitplanes.c (+0, -356)
/source/blender/imbuf/intern/cmap.c (+0, -580)
/source/blender/imbuf/intern/cspace.c (+0, -176)
/source/blender/imbuf/intern/data.c (+0, -142)
/source/blender/imbuf/intern/dither.c (+0, -130)
/source/blender/imbuf/intern/gen_dynlibtiff.py (+0, -303)
/source/blender/imbuf/intern/ham.c (+0, -276)
/source/blender/imbuf/intern/hamx.c (+0, -581)
/source/blender/imbuf/intern/iff.c (+0, -224)
/source/blender/imbuf/intern/imbuf_patch.h (+0, -111)
/source/blender/imbuf/intern/IMB_amiga.h (+0, -47)
/source/blender/imbuf/intern/IMB_anim5.h (+0, -20)
/source/blender/imbuf/intern/IMB_bitplanes.h (+0, -47)
/source/blender/imbuf/intern/IMB_bmp.h (+0, -47)
/source/blender/imbuf/intern/IMB_cmap.h (+0, -46)
/source/blender/imbuf/intern/IMB_cocoa.h (+0, -43)
/source/blender/imbuf/intern/IMB_divers.h (+0, -45)
/source/blender/imbuf/intern/IMB_dpxcineon.h (+0, -47)
/source/blender/imbuf/intern/IMB_ham.h (+0, -45)
/source/blender/imbuf/intern/IMB_hamx.h (+0, -47)
/source/blender/imbuf/intern/IMB_iff.h (+0, -46)
/source/blender/imbuf/intern/IMB_imginfo.h (+0, -85)
/source/blender/imbuf/intern/IMB_iris.h (+0, -46)
/source/blender/imbuf/intern/IMB_jp2.h (+0, -49)
/source/blender/imbuf/intern/IMB_jpeg.h (+0, -49)
/source/blender/imbuf/intern/IMB_png.h (+0, -48)
/source/blender/imbuf/intern/IMB_radiance_hdr.h (+0, -42)
/source/blender/imbuf/intern/IMB_targa.h (+0, -48)
/source/blender/imbuf/intern/IMB_tiff.h (+0, -45)
/source/blender/imbuf/intern/imginfo.c (+0, -158)
/source/blender/imbuf/intern/matrix.h (+0, -84)
/source/blender/imbuf/intern/anim5.c (+0, -539)
/source/blender/imbuf/intern/antialias.c (+0, -466)
/source/blender/imbuf/intern/bitplanes.c (+0, -356)
/source/blender/imbuf/intern/cmap.c (+0, -580)
/source/blender/imbuf/intern/cspace.c (+0, -176)
/source/blender/imbuf/intern/data.c (+0, -142)
/source/blender/imbuf/intern/dither.c (+0, -130)
/source/blender/imbuf/intern/gen_dynlibtiff.py (+0, -303)
/source/blender/imbuf/intern/ham.c (+0, -276)
/source/blender/imbuf/intern/hamx.c (+0, -581)
/source/blender/imbuf/intern/iff.c (+0, -224)
/source/blender/imbuf/intern/imbuf_patch.h (+0, -111)
/source/blender/imbuf/intern/IMB_amiga.h (+0, -47)
/source/blender/imbuf/intern/IMB_anim5.h (+0, -20)
/source/blender/imbuf/intern/IMB_bitplanes.h (+0, -47)
/source/blender/imbuf/intern/IMB_bmp.h (+0, -47)
/source/blender/imbuf/intern/IMB_cmap.h (+0, -46)
/source/blender/imbuf/intern/IMB_cocoa.h (+0, -43)
/source/blender/imbuf/intern/IMB_divers.h (+0, -45)
/source/blender/imbuf/intern/IMB_dpxcineon.h (+0, -47)
/source/blender/imbuf/intern/IMB_ham.h (+0, -45)
/source/blender/imbuf/intern/IMB_hamx.h (+0, -47)
/source/blender/imbuf/intern/IMB_iff.h (+0, -46)
/source/blender/imbuf/intern/IMB_imginfo.h (+0, -85)
/source/blender/imbuf/intern/IMB_iris.h (+0, -46)
/source/blender/imbuf/intern/IMB_jp2.h (+0, -49)
/source/blender/imbuf/intern/IMB_jpeg.h (+0, -49)
/source/blender/imbuf/intern/IMB_png.h (+0, -48)
/source/blender/imbuf/intern/IMB_radiance_hdr.h (+0, -42)
/source/blender/imbuf/intern/IMB_targa.h (+0, -48)
/source/blender/imbuf/intern/IMB_tiff.h (+0, -45)
/source/blender/imbuf/intern/imginfo.c (+0, -158)
/source/blender/imbuf/intern/matrix.h (+0, -84)
58 Modified Paths:
/release/scripts/ui/properties_scene.py (+1, -0) (Diff)
/source/blender/blenkernel/BKE_blender.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/blender.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/bmfont.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/image.c (+24, -22) (Diff)
/source/blender/blenkernel/intern/texture.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/writeavi.c (+0, -5) (Diff)
/source/blender/blenloader/intern/readfile.c (+10, -2) (Diff)
/source/blender/blenpluginapi/iff.h (+26, -126) (Diff)
/source/blender/blenpluginapi/intern/pluginapi.c (+1, -64) (Diff)
/source/blender/editors/screen/screendump.c (+0, -2) (Diff)
/source/blender/editors/space_file/filelist.c (+2, -0) (Diff)
/source/blender/editors/space_file/writeimage.c (+0, -1) (Diff)
/source/blender/editors/space_image/image_buttons.c (+0, -1) (Diff)
/source/blender/imbuf/IMB_imbuf.h (+22, -172) (Diff)
/source/blender/imbuf/IMB_imbuf_types.h (+38, -100) (Diff)
/source/blender/imbuf/IMB_thumbs.h (+1, -1) (Diff)
/source/blender/imbuf/intern/allocimbuf.c (+6, -114) (Diff)
/source/blender/imbuf/intern/anim.c (+1, -34) (Diff)
/source/blender/imbuf/intern/bmp.c (+3, -5) (Diff)
/source/blender/imbuf/intern/cineon/cineon_dpx.c (+2, -2) (Diff)
/source/blender/imbuf/intern/dds/dds_api.cpp (+4, -2) (Diff)
/source/blender/imbuf/intern/dds/dds_api.h (+1, -1) (Diff)
/source/blender/imbuf/intern/divers.c (+0, -80) (Diff)
/source/blender/imbuf/intern/dynlibtiff.c (+19, -1) (Diff)
/source/blender/imbuf/intern/dynlibtiff.h (+2, -0) (Diff)
/source/blender/imbuf/intern/filter.c (+60, -3) (Diff)
/source/blender/imbuf/intern/imageprocess.c (+2, -0) (Diff)
/source/blender/imbuf/intern/imbuf.h (+5, -90) (Diff)
/source/blender/imbuf/intern/imbuf_cocoa.m (+3, -1) (Diff)
/source/blender/imbuf/intern/IMB_anim.h (+3, -16) (Diff)
/source/blender/imbuf/intern/iris.c (+30, -20) (Diff)
/source/blender/imbuf/intern/jp2.c (+3, -4) (Diff)
/source/blender/imbuf/intern/jpeg.c (+25, -20) (Diff)
/source/blender/imbuf/intern/openexr/openexr_api.cpp (+3, -3) (Diff)
/source/blender/imbuf/intern/openexr/openexr_api.h (+1, -1) (Diff)
/source/blender/imbuf/intern/png.c (+18, -20) (Diff)
/source/blender/imbuf/intern/radiance_hdr.c (+3, -6) (Diff)
/source/blender/imbuf/intern/readimage.c (+99, -222) (Diff)
/source/blender/imbuf/intern/rectop.c (+0, -1) (Diff)
/source/blender/imbuf/intern/rotate.c (+0, -1) (Diff)
/source/blender/imbuf/intern/scaling.c (+0, -189) (Diff)
/source/blender/imbuf/intern/targa.c (+34, -56) (Diff)
/source/blender/imbuf/intern/thumbs.c (+14, -14) (Diff)
/source/blender/imbuf/intern/tiff.c (+124, -87) (Diff)
/source/blender/imbuf/intern/util.c (+28, -92) (Diff)
/source/blender/imbuf/intern/writeimage.c (+12, -160) (Diff)
/source/blender/makesdna/DNA_image_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+19, -18) (Diff)
/source/blender/makesrna/intern/rna_image.c (+0, -5) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+6, -4) (Diff)
/source/blender/quicktime/apple/qtkit_import.m (+8, -1) (Diff)
/source/blender/quicktime/apple/quicktime_import.c (+2, -0) (Diff)
/source/blender/render/intern/source/texture_image.c (+50, -103) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+0, -6) (Diff)
/source/creator/creator.c (+4, -20) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+1, -4) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp (+1, -5) (Diff)
/source/blender/blenkernel/BKE_blender.h (+1, -1) (Diff)
/source/blender/blenkernel/intern/blender.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/bmfont.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/image.c (+24, -22) (Diff)
/source/blender/blenkernel/intern/texture.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/writeavi.c (+0, -5) (Diff)
/source/blender/blenloader/intern/readfile.c (+10, -2) (Diff)
/source/blender/blenpluginapi/iff.h (+26, -126) (Diff)
/source/blender/blenpluginapi/intern/pluginapi.c (+1, -64) (Diff)
/source/blender/editors/screen/screendump.c (+0, -2) (Diff)
/source/blender/editors/space_file/filelist.c (+2, -0) (Diff)
/source/blender/editors/space_file/writeimage.c (+0, -1) (Diff)
/source/blender/editors/space_image/image_buttons.c (+0, -1) (Diff)
/source/blender/imbuf/IMB_imbuf.h (+22, -172) (Diff)
/source/blender/imbuf/IMB_imbuf_types.h (+38, -100) (Diff)
/source/blender/imbuf/IMB_thumbs.h (+1, -1) (Diff)
/source/blender/imbuf/intern/allocimbuf.c (+6, -114) (Diff)
/source/blender/imbuf/intern/anim.c (+1, -34) (Diff)
/source/blender/imbuf/intern/bmp.c (+3, -5) (Diff)
/source/blender/imbuf/intern/cineon/cineon_dpx.c (+2, -2) (Diff)
/source/blender/imbuf/intern/dds/dds_api.cpp (+4, -2) (Diff)
/source/blender/imbuf/intern/dds/dds_api.h (+1, -1) (Diff)
/source/blender/imbuf/intern/divers.c (+0, -80) (Diff)
/source/blender/imbuf/intern/dynlibtiff.c (+19, -1) (Diff)
/source/blender/imbuf/intern/dynlibtiff.h (+2, -0) (Diff)
/source/blender/imbuf/intern/filter.c (+60, -3) (Diff)
/source/blender/imbuf/intern/imageprocess.c (+2, -0) (Diff)
/source/blender/imbuf/intern/imbuf.h (+5, -90) (Diff)
/source/blender/imbuf/intern/imbuf_cocoa.m (+3, -1) (Diff)
/source/blender/imbuf/intern/IMB_anim.h (+3, -16) (Diff)
/source/blender/imbuf/intern/iris.c (+30, -20) (Diff)
/source/blender/imbuf/intern/jp2.c (+3, -4) (Diff)
/source/blender/imbuf/intern/jpeg.c (+25, -20) (Diff)
/source/blender/imbuf/intern/openexr/openexr_api.cpp (+3, -3) (Diff)
/source/blender/imbuf/intern/openexr/openexr_api.h (+1, -1) (Diff)
/source/blender/imbuf/intern/png.c (+18, -20) (Diff)
/source/blender/imbuf/intern/radiance_hdr.c (+3, -6) (Diff)
/source/blender/imbuf/intern/readimage.c (+99, -222) (Diff)
/source/blender/imbuf/intern/rectop.c (+0, -1) (Diff)
/source/blender/imbuf/intern/rotate.c (+0, -1) (Diff)
/source/blender/imbuf/intern/scaling.c (+0, -189) (Diff)
/source/blender/imbuf/intern/targa.c (+34, -56) (Diff)
/source/blender/imbuf/intern/thumbs.c (+14, -14) (Diff)
/source/blender/imbuf/intern/tiff.c (+124, -87) (Diff)
/source/blender/imbuf/intern/util.c (+28, -92) (Diff)
/source/blender/imbuf/intern/writeimage.c (+12, -160) (Diff)
/source/blender/makesdna/DNA_image_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+19, -18) (Diff)
/source/blender/makesrna/intern/rna_image.c (+0, -5) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+6, -4) (Diff)
/source/blender/quicktime/apple/qtkit_import.m (+8, -1) (Diff)
/source/blender/quicktime/apple/quicktime_import.c (+2, -0) (Diff)
/source/blender/render/intern/source/texture_image.c (+50, -103) (Diff)
/source/blender/windowmanager/intern/wm_init_exit.c (+0, -6) (Diff)
/source/creator/creator.c (+4, -20) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+1, -4) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp (+1, -5) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021