Commit: 231e894a7e7ccc19eafd3ff074e51623d5f9ffca
Author: Antonio Vazquez
Date: Sat Jul 14 13:41:17 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB231e894a7e7ccc19eafd3ff074e51623d5f9ffca
Update preview panel for grease pencil materials
Also some test changes to preview_grease_pencil.blend file
===================================================================
M release/datafiles/preview_grease_pencil.blend
M source/blender/editors/render/render_preview.c
===================================================================
diff --git a/release/datafiles/preview_grease_pencil.blend
b/release/datafiles/preview_grease_pencil.blend
index 80b136745b0..875fe64412c 100644
Binary files a/release/datafiles/preview_grease_pencil.blend and
b/release/datafiles/preview_grease_pencil.blend differ
diff --git a/source/blender/editors/render/render_preview.c
b/source/blender/editors/render/render_preview.c
index 4a30012b4a9..a10f8342b57 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -1252,11 +1252,23 @@ void ED_preview_shader_job(const bContext *C, void
*owner, ID *id, ID *parent, M
sp->parent = parent;
sp->slot = slot;
sp->bmain = CTX_data_main(C);
+ Material *ma = NULL;
/* hardcoded preview .blend for Eevee + Cycles, this should be solved
* once with custom preview .blend path for external engines */
if ((method != PR_NODE_RENDER) && id_type != ID_TE) {
- sp->pr_main = G_pr_main_cycles;
+ /* grease pencil use its own preview file */
+ if (GS(id->name) == ID_MA) {
+ ma = (Material *)id;
+ }
+
+ if ((ma == NULL) || (ma->gp_style == NULL)) {
+ sp->pr_main = G_pr_main_cycles;
+ }
+ else {
+ sp->pr_main = G_pr_main_grease_pencil;
+ }
+
}
else {
sp->pr_main = G_pr_main;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
