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 | |
parent | 2aa0a69015f4734a0bd6316418af8021b574cd79 (diff) | |
parent | 74fdf68a413fe9fb6345903fa682ca1a46be3060 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/lamp.c | 13 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 13 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/texture.c | 13 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/world.c | 13 |
4 files changed, 32 insertions, 20 deletions
diff --git a/source/blender/blenkernel/intern/lamp.c b/source/blender/blenkernel/intern/lamp.c index 2c57a2bdb0a..1ca794b8a4a 100644 --- a/source/blender/blenkernel/intern/lamp.c +++ b/source/blender/blenkernel/intern/lamp.c @@ -139,12 +139,15 @@ Lamp *BKE_lamp_copy(Main *bmain, const Lamp *la) Lamp *BKE_lamp_localize(Lamp *la) { - /* TODO replace with something like - * Lamp *la_copy; - * BKE_id_copy_ex(bmain, &la->id, (ID **)&la_copy, LIB_ID_COPY_NO_MAIN | LIB_ID_COPY_NO_PREVIEW | LIB_ID_COPY_NO_USER_REFCOUNT, false); - * return la_copy; + /* TODO(bastien): Replace with something like: * - * ... Once f*** nodes are fully converted to that too :( */ + * Lamp *la_copy; + * BKE_id_copy_ex(bmain, &la->id, (ID **)&la_copy, + * LIB_ID_COPY_NO_MAIN | LIB_ID_COPY_NO_PREVIEW | LIB_ID_COPY_NO_USER_REFCOUNT, + * false); + * return la_copy; + * + * NOTE: Only possible once nested node trees are fully converted to that too. */ Lamp *lan = BKE_libblock_copy_nolib(&la->id, false); 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; diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index 356a36f5244..2a7cf9aadb6 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -464,12 +464,15 @@ Tex *BKE_texture_copy(Main *bmain, const Tex *tex) /* texture copy without adding to main dbase */ Tex *BKE_texture_localize(Tex *tex) { - /* TODO replace with something like - * Tex *tex_copy; - * BKE_id_copy_ex(bmain, &tex->id, (ID **)&tex_copy, LIB_ID_COPY_NO_MAIN | LIB_ID_COPY_NO_PREVIEW | LIB_ID_COPY_NO_USER_REFCOUNT, false); - * return tex_copy; + /* TODO(bastien): Replace with something like: * - * ... Once f*** nodes are fully converted to that too :( */ + * Tex *tex_copy; + * BKE_id_copy_ex(bmain, &tex->id, (ID **)&tex_copy, + * LIB_ID_COPY_NO_MAIN | LIB_ID_COPY_NO_PREVIEW | LIB_ID_COPY_NO_USER_REFCOUNT, + * false); + * return tex_copy; + * + * NOTE: Only possible once nested node trees are fully converted to that too. */ Tex *texn; diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index 14a9133f8fb..cb8103588a7 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -142,12 +142,15 @@ World *BKE_world_copy(Main *bmain, const World *wrld) World *BKE_world_localize(World *wrld) { - /* TODO replace with something like - * World *wrld_copy; - * BKE_id_copy_ex(bmain, &wrld->id, (ID **)&wrld_copy, LIB_ID_COPY_NO_MAIN | LIB_ID_COPY_NO_PREVIEW | LIB_ID_COPY_NO_USER_REFCOUNT, false); - * return wrld_copy; + /* TODO(bastien): Replace with something like: * - * ... Once f*** nodes are fully converted to that too :( */ + * World *wrld_copy; + * BKE_id_copy_ex(bmain, &wrld->id, (ID **)&wrld_copy, + * LIB_ID_COPY_NO_MAIN | LIB_ID_COPY_NO_PREVIEW | LIB_ID_COPY_NO_USER_REFCOUNT, + * false); + * return wrld_copy; + * + * NOTE: Only possible once nested node trees are fully converted to that too. */ World *wrldn; |