diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-15 18:28:37 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-11-15 18:28:37 +0300 |
| commit | 61ee2f0db8ed5ff19f74dd06fb3a3a77f9636ee6 (patch) | |
| tree | 84b9b47cf21d378d14cba1e191e2e8f0777a1edc /source/blender/blenkernel/intern/material.c | |
| parent | 2aa0a69015f4734a0bd6316418af8021b574cd79 (diff) | |
| parent | 74fdf68a413fe9fb6345903fa682ca1a46be3060 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 4d764e70ef1..fc0423dc5e5 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -225,12 +225,15 @@ Material *BKE_material_copy(Main *bmain, const Material *ma) /* XXX (see above) material copy without adding to main dbase */ Material *BKE_material_localize(Material *ma) { - /* TODO replace with something like - * Material *ma_copy; - * BKE_id_copy_ex(bmain, &ma->id, (ID **)&ma_copy, LIB_ID_COPY_NO_MAIN | LIB_ID_COPY_NO_PREVIEW | LIB_ID_COPY_NO_USER_REFCOUNT, false); - * return ma_copy; + /* TODO(bastien): Replace with something like: * - * ... Once f*** nodes are fully converted to that too :( */ + * Material *ma_copy; + * BKE_id_copy_ex(bmain, &ma->id, (ID **)&ma_copy, + * LIB_ID_COPY_NO_MAIN | LIB_ID_COPY_NO_PREVIEW | LIB_ID_COPY_NO_USER_REFCOUNT, + * false); + * return ma_copy; + * + * NOTE: Only possible once nested node trees are fully converted to that too. */ Material *man; |