Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-09-14 00:05:41 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-09-14 00:07:08 +0300
commit1cdfc1d199c3c7a03f1511df6007160b97ccaefb (patch)
treecad65008b08399fc3d8a23ca067118f482549aaa
parentfd5c1972cd5c8a826c0d40effb0e2d367389666a (diff)
Fix T69857: image.load() API function does not load pixels
Broke after recent changes for DNA default initialization.
-rw-r--r--source/blender/blenkernel/intern/image.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 3718e35176f..170cc230332 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -297,10 +297,10 @@ static void image_init(Image *ima, short source, short type)
{
BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(ima, id));
- ima->ok = IMA_OK;
-
MEMCPY_STRUCT_AFTER(ima, DNA_struct_default_get(Image), id);
+ ima->ok = IMA_OK;
+
ima->source = source;
ima->type = type;