Merge branch 'master' into KTX_supportKTX_support

1 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc
index 79c3b2f7ac6..c1c75e485f7 100644
--- a/source/blender/editors/render/render_preview.cc
+++ b/source/blender/editors/render/render_preview.cc
@@ -767,7 +767,7 @@ struct ObjectPreviewData {
   /* The main for the preview, not of the current file. */
   Main *pr_main;
   /* Copy of the object to create the preview for. The copy is for thread safety (and to insert
-   * it into an own main). */
+   * it into its own main). */
   Object *object;
   /* Current frame. */
   int cfra;
@@ -1061,11 +1061,11 @@ static void shader_preview_texture(ShaderPreview *sp, Tex *tex, Scene *sce, Rend
       /* Evaluate texture at tex_coord. */
       TexResult texres = {0};
       BKE_texture_get_value_ex(sce, tex, tex_coord, &texres, img_pool, color_manage);
-
-      rect_float[0] = texres.tr;
-      rect_float[1] = texres.tg;
-      rect_float[2] = texres.tb;
-      rect_float[3] = texres.talpha ? texres.ta : 1.0f;
+      copy_v4_fl4(rect_float,
+                  texres.trgba[0],
+                  texres.trgba[1],
+                  texres.trgba[2],
+                  texres.talpha ? texres.trgba[3] : 1.0f);
 
       rect_float += 4;
     }