Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Reynish <billrey@me.com>2019-04-14 19:41:10 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-04-14 21:09:02 +0300
commitf5ea1fc4fbafbac6f648ba0d9d9ef16ca8323041 (patch)
tree26db8316aa052ad327b44ef15746ac6e09896143 /source/blender/editors/interface
parent8b0102b443571a19ab17e141623cfc029320813c (diff)
Render: new material preview
* EEVEE support through irradiance volume and light probe. * New shader ball shape (designed by Robin Marin). * New cloth and liquid shapes, removed monkey. * Replace world sphere by toggle to use world for any shape. * Slight bevel on cube. * More subdivision for displacement preview. * Fixed and improved UV mapping for all shapes. * Material icon / asset preview now uses specified shape instead of always a sphere. So for example hair material can be displayed as hair. Ref T57683
Diffstat (limited to 'source/blender/editors/interface')
-rw-r--r--source/blender/editors/interface/interface_templates.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 1591244c9b5..897a07708d0 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -2215,7 +2215,7 @@ void uiTemplatePreview(
if (!ui_preview) {
ui_preview = MEM_callocN(sizeof(uiPreview), "uiPreview");
BLI_strncpy(ui_preview->preview_id, preview_id, sizeof(ui_preview->preview_id));
- ui_preview->height = (short)(UI_UNIT_Y * 5.6f);
+ ui_preview->height = (short)(UI_UNIT_Y * 7.6f);
BLI_addtail(&ar->ui_previews, ui_preview);
}
@@ -2257,6 +2257,8 @@ void uiTemplatePreview(
col = uiLayoutColumn(row, true);
uiLayoutSetScaleX(col, 1.5);
uiItemR(col, &material_ptr, "preview_render_type", UI_ITEM_R_EXPAND, "", ICON_NONE);
+ uiItemS(col);
+ uiItemR(col, &material_ptr, "use_preview_world", 0, "", ICON_WORLD);
}
if (pr_texture) {