Commit: 20abefa18e22cfdf92910ae48e6a150e9f2fc3b2
Author: Antonio Vazquez
Date: Wed Oct 6 16:05:51 2021 +0200
Branches: temp-eevee-gpencil-rewrite
https://developer.blender.org/rB20abefa18e22cfdf92910ae48e6a150e9f2fc3b2
Revert different types of materials creation
===================================================================
M source/blender/editors/render/render_shading.c
===================================================================
diff --git a/source/blender/editors/render/render_shading.c
b/source/blender/editors/render/render_shading.c
index 737efd76118..7b2667905ff 100644
--- a/source/blender/editors/render/render_shading.c
+++ b/source/blender/editors/render/render_shading.c
@@ -767,7 +767,7 @@ static int new_material_exec(bContext *C, wmOperator
*UNUSED(op))
}
else {
const char *name = DATA_("Material");
- if ((!(ob != NULL && ob->type == OB_GPENCIL)) ||
(GP_OBJECT_USE_SCENE_RENDER(ob))) {
+ if (!(ob != NULL && ob->type == OB_GPENCIL)) {
ma = BKE_material_add(bmain, name);
}
else {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
