diff options
| author | Andrea Weikert <elubie@gmx.net> | 2007-09-02 21:25:03 +0400 |
|---|---|---|
| committer | Andrea Weikert <elubie@gmx.net> | 2007-09-02 21:25:03 +0400 |
| commit | 356ab943736e8a2434a8ff5845873482597ba5e2 (patch) | |
| tree | 910356ace904dc4f11f1daf15330bb0827934f5b /source/blender/src/buttons_shading.c | |
| parent | 22c23fb04f7f1297b971f03d69b8b04b7dd9caa4 (diff) | |
== imagebrowser ==
Initial commit of imagebrowser in trunk.
BIG COMMIT!
Main changes:
* completely reworked imasel space
* creation and storage of the preview images for materials, textures, world and lamp
* thumbnails of images and movie files when browsing in the file system
* loading previews from external .blend when linking or appending
* thumbnail caching according to the Thumbnail Managing Standard: http://jens.triq.net/thumbnail-spec/
* for now just kept imasel access mostly as old imgbrowser (CTRL+F4, CTRL+F1) a bit hidden still.
* filtering of file types (images, movies, .blend, py,...)
* preliminary managing of bookmarks ('B' button to add, XKEY while bookmark active to delete)
More detailed info which will be updated here: http://wiki.blender.org/index.php/User:Elubie/PreviewImageBrowser
Places that need special review (and probably fixes):
* BLO_blendhandle_get_previews in readblenentry
* readfile.c: do_version and refactorings of do_library_append
* UI integration
TODO and known issues still:
* Accented characters do not display correctly with international fonts
* Crash was reported when browsing in directory with movie files
* Bookmark management still needs some UI work (second scrollbar?), feedback here is welcome!
Credits:
Samir Bharadwaj (samirbharadwaj@yahoo.com) for the icon images.
Many thanks to everyone who gave feedback and helped so far!
Diffstat (limited to 'source/blender/src/buttons_shading.c')
| -rw-r--r-- | source/blender/src/buttons_shading.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/src/buttons_shading.c b/source/blender/src/buttons_shading.c index 1e1a9b1e01f..ab0c1cb3ad2 100644 --- a/source/blender/src/buttons_shading.c +++ b/source/blender/src/buttons_shading.c @@ -94,6 +94,7 @@ #include "BIF_mywindow.h" #include "BIF_space.h" #include "BIF_glutil.h" +#include "BIF_imasel.h" #include "BIF_interface.h" #include "BIF_toolbox.h" #include "BIF_space.h" @@ -876,7 +877,12 @@ static void image_load_fs_cb(void *ima_pp_v, void *iuser_v) #else else name = U.textudir; #endif - activate_fileselect_args(FILE_SPECIAL, "SELECT IMAGE", name, load_image_cb, ima_pp_v, iuser_v); + if (G.qual & LR_CTRLKEY) { + activate_imageselect_args(FILE_SPECIAL, "SELECT IMAGE", name, load_image_cb, ima_pp_v, iuser_v); + } + else { + activate_fileselect_args(FILE_SPECIAL, "SELECT IMAGE", name, load_image_cb, ima_pp_v, iuser_v); + } } /* 5 layer button callbacks... */ |