From 64aa96d421df8857dcf8d54e8613ff3cdb6c8a9b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 2 Jun 2023 13:47:41 +1000 Subject: [PATCH] Fix failure to paste material color alpha & paste line-art Error in [0] excluded these members from pasting. [0]: 5177e2f20b37eb5c97f0ed989febd7f783ae4f1f --- source/blender/editors/render/render_shading.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/render/render_shading.cc b/source/blender/editors/render/render_shading.cc index a778252b7b0..04e2b40f215 100644 --- a/source/blender/editors/render/render_shading.cc +++ b/source/blender/editors/render/render_shading.cc @@ -2802,7 +2802,7 @@ static int paste_material_nodetree_ids_decref(LibraryIDLinkCallbackData *cb_data } /** - * Re-map ID's from the clipboard to ID's in `main`, by name. + * Re-map ID's from the clipboard to ID's in `bmain`, by name. */ static int paste_material_nodetree_ids_relink_or_clear(LibraryIDLinkCallbackData *cb_data) { @@ -2934,7 +2934,6 @@ static int paste_material_exec(bContext *C, wmOperator *op) SWAP_MEMBER(line_col); SWAP_MEMBER(line_priority); SWAP_MEMBER(vcol_alpha); - SWAP_MEMBER(vcol_alpha); SWAP_MEMBER(alpha_threshold); SWAP_MEMBER(refract_depth); @@ -2942,6 +2941,8 @@ static int paste_material_exec(bContext *C, wmOperator *op) SWAP_MEMBER(blend_shadow); SWAP_MEMBER(blend_flag); + SWAP_MEMBER(lineart); + #undef SWAP_MEMBER /* The node-tree from the clipboard is now assigned to the local material,