[Bf-blender-cvs] [1cdfc1d199c] master: Fix T69857: image.load() API function does not load pixels

[Brecht Van Lommel]

Commit: 1cdfc1d199c3c7a03f1511df6007160b97ccaefb
Author: Brecht Van Lommel
Date:   Fri Sep 13 23:05:41 2019 +0200
Branches: master
https://developer.blender.org/rB1cdfc1d199c3c7a03f1511df6007160b97ccaefb

Fix T69857: image.load() API function does not load pixels

Broke after recent changes for DNA default initialization.

===================================================================

M	source/blender/blenkernel/intern/image.c

===================================================================

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;