Blender Git Loki
Git Commits -> Revision e11d22a
Revision e11d22a by Ton Roosendaal (master) January 22, 2013, 11:18 (GMT) |
Matcap support in 3D Viewport. Full log is here: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability#Matcap_in_3D_viewport Implementation notes: - Matcaps are an extension of Solid draw mode, and don't show in other drawmodes. (It's mostly intended to aid modeling/sculpt) - By design, Matcaps are a UI feature, and only stored locally for the UI itself, and won't affect rendering or materials. - Currently a set of 16 (GPL licensed) Matcaps have been compiled into Blender. It doesn't take memory or cpu time, until you use it. - Brush Icons and Matcaps use same code now, and only get generated/allocated on actually using it (instead of on startup). - The current set might get new or different images still, based on user feedback. - Matcap images are 512x512 pixels, so each image takes 1 Mb memory. Unused matcaps get freed immediately. The Matcap icon previews (128x128 pixels) stay in memory. - Loading own matcap image files will be added later. That needs design and code work to get it stable and memory-friendly. - The GLSL code uses the ID PreviewImage for matcaps. I tested it using the existing Material previews, which has its limits... especially for textured previews the normal-mapped matcap won't look good. |
Commit Details:
Full Hash: e11d22a6b751c750c40226cb027e7805adb7d4e4
SVN Revision: 53987
Parent Commit: 1e3a293
Lines Changed: +679, -100
16 Added Paths:
/release/datafiles/matcaps/mc01.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc02.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc03.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc04.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc05.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc06.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc07.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc08.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc09.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc10.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc11.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc12.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc13.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc14.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc15.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc16.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc02.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc03.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc04.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc05.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc06.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc07.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc08.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc09.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc10.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc11.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc12.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc13.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc14.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc15.jpg (+0, -0) (View)
/release/datafiles/matcaps/mc16.jpg (+0, -0) (View)
25 Modified Paths:
/release/scripts/startup/bl_ui/space_view3d.py (+4, -1) (Diff)
/source/blender/blenkernel/intern/icons.c (+6, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+2, -1) (Diff)
/source/blender/editors/datafiles/CMakeLists.txt (+19, -0) (Diff)
/source/blender/editors/datafiles/SConscript (+18, -0) (Diff)
/source/blender/editors/include/ED_datafiles.h (+51, -0) (Diff)
/source/blender/editors/include/UI_icons.h (+18, -0) (Diff)
/source/blender/editors/include/UI_interface.h (+1, -0) (Diff)
/source/blender/editors/include/UI_interface_icons.h (+3, -0) (Diff)
/source/blender/editors/interface/interface_icons.c (+124, -29) (Diff)
/source/blender/editors/interface/interface_templates.c (+82, -0) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+42, -3) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+15, -2) (Diff)
/source/blender/gpu/GPU_extensions.h (+4, -1) (Diff)
/source/blender/gpu/GPU_material.h (+3, -0) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+41, -9) (Diff)
/source/blender/gpu/intern/gpu_codegen.h (+2, -0) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+59, -45) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+54, -0) (Diff)
/source/blender/gpu/intern/gpu_material.c (+46, -0) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+15, -0) (Diff)
/source/blender/makesdna/DNA_ID.h (+3, -1) (Diff)
/source/blender/makesdna/DNA_view3d_types.h (+11, -8) (Diff)
/source/blender/makesrna/intern/rna_space.c (+52, -0) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+4, -0) (Diff)
/source/blender/blenkernel/intern/icons.c (+6, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+2, -1) (Diff)
/source/blender/editors/datafiles/CMakeLists.txt (+19, -0) (Diff)
/source/blender/editors/datafiles/SConscript (+18, -0) (Diff)
/source/blender/editors/include/ED_datafiles.h (+51, -0) (Diff)
/source/blender/editors/include/UI_icons.h (+18, -0) (Diff)
/source/blender/editors/include/UI_interface.h (+1, -0) (Diff)
/source/blender/editors/include/UI_interface_icons.h (+3, -0) (Diff)
/source/blender/editors/interface/interface_icons.c (+124, -29) (Diff)
/source/blender/editors/interface/interface_templates.c (+82, -0) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+42, -3) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+15, -2) (Diff)
/source/blender/gpu/GPU_extensions.h (+4, -1) (Diff)
/source/blender/gpu/GPU_material.h (+3, -0) (Diff)
/source/blender/gpu/intern/gpu_codegen.c (+41, -9) (Diff)
/source/blender/gpu/intern/gpu_codegen.h (+2, -0) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+59, -45) (Diff)
/source/blender/gpu/intern/gpu_extensions.c (+54, -0) (Diff)
/source/blender/gpu/intern/gpu_material.c (+46, -0) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+15, -0) (Diff)
/source/blender/makesdna/DNA_ID.h (+3, -1) (Diff)
/source/blender/makesdna/DNA_view3d_types.h (+11, -8) (Diff)
/source/blender/makesrna/intern/rna_space.c (+52, -0) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+4, -0) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021