blender
/
blender
134
399
Fork 581
Code Issues 6.3k Pull Requests 757 Projects 19 Wiki Activity

Fix T43769: Envmap Texture copy looses image

This commit is contained in:
Campbell Barton 2015-02-23 18:22:09 +11:00
parent 7c03ef295b
commit 96c452bdf6
Notes: blender-bot 2023-02-14 09:27:18 +01:00 
Referenced by issue #43769, Full scene copy loses link to the environment map image file
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_texture.h
View File

@ -132,6 +132,7 @@ struct OceanTex *BKE_add_oceantex(void);
struct OceanTex *BKE_copy_oceantex(struct OceanTex *ot);
bool BKE_texture_dependsOnTime(const struct Tex *texture);
bool BKE_texture_is_image_user(const struct Tex *tex);
void BKE_texture_get_value(struct Scene *scene, struct Tex *texture, float *tex_co, struct TexResult *texres, bool use_color_management);

31
source/blender/blenkernel/intern/texture.c
View File

@ -832,8 +832,12 @@ Tex *BKE_texture_copy(Tex *tex)
Tex *texn;
texn = BKE_libblock_copy(&tex->id);
if (texn->type == TEX_IMAGE) id_us_plus((ID *)texn->ima);
else texn->ima = NULL;
if (BKE_texture_is_image_user(tex)) {
id_us_plus((ID *)texn->ima);
}
else {
texn->ima = NULL;
}
if (texn->coba) texn->coba = MEM_dupallocN(texn->coba);
if (texn->env) texn->env = BKE_copy_envmap(texn->env);
@ -1604,6 +1608,29 @@ void BKE_free_oceantex(struct OceanTex *ot)
MEM_freeN(ot);
}
/**
* \returns true if this texture can use its #Texture.ima (even if its NULL)
*/
bool BKE_texture_is_image_user(const struct Tex *tex)
{
switch (tex->type) {
case TEX_IMAGE:
{
return true;
}
case TEX_ENVMAP:
{
if (tex->env) {
if (tex->env->stype == ENV_LOAD) {
return true;
}
}
break;
}
}
return false;
}
/* ------------------------------------------------------------------------- */
bool BKE_texture_dependsOnTime(const struct Tex *texture)