griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix failure to paste material color alpha & paste line-art

Browse Source 
Error in [0] excluded these members from pasting.

[0]: 5177e2f20b
This commit is contained in:
Campbell Barton
2023-06-02 13:47:41 +10:00
parent 168b66461d
commit 64aa96d421
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/render/render_shading.cc
View File

@@ -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,