diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-02-08 19:56:14 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-02-08 19:56:14 +0400 |
| commit | 32a6a3eb63b80e47fb083d49814090b89541e9ab (patch) | |
| tree | 9575675b6a615906de50834b3ec0b39c2fa12c0b /source/blender/blenkernel/BKE_image.h | |
| parent | 95b28a65f366c4a1f571f35dabd79edaa94cfe51 (diff) | |
Fix #33747: do better backwards compatibility for image transparency changes.
The use alpha option moved from the texture datablock to the image, and now it
will duplicate the image datablock in case you have one texture using alpha and
the other not.
Diffstat (limited to 'source/blender/blenkernel/BKE_image.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_image.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h index f098defb907..d12b048bc96 100644 --- a/source/blender/blenkernel/BKE_image.h +++ b/source/blender/blenkernel/BKE_image.h @@ -205,7 +205,7 @@ void BKE_image_memorypack(struct Image *ima); void BKE_image_print_memlist(void); /* empty image block, of similar type and filename */ -struct Image *BKE_image_copy(struct Image *ima); +struct Image *BKE_image_copy(struct Main *bmain, struct Image *ima); /* merge source into dest, and free source */ void BKE_image_merge(struct Image *dest, struct Image *source); |