[Bf-blender-cvs] [0a41cedcf9b] temp-T98375-share-gpu-textures: Add back support for glTouch.

Jeroen Bakker noreply at git.blender.org
Tue May 31 07:46:43 CEST 2022


Commit: 0a41cedcf9b13b93797e7e528142589b30e2956d
Author: Jeroen Bakker
Date:   Tue May 31 07:46:39 2022 +0200
Branches: temp-T98375-share-gpu-textures
https://developer.blender.org/rB0a41cedcf9b13b93797e7e528142589b30e2956d

Add back support for glTouch.

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

M	source/blender/makesrna/intern/rna_image_api.c

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

diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c
index 6f742284616..db2e554f2e5 100644
--- a/source/blender/makesrna/intern/rna_image_api.c
+++ b/source/blender/makesrna/intern/rna_image_api.c
@@ -191,18 +191,12 @@ static int rna_Image_gl_load(
   return 0; /* GL_NO_ERROR */
 }
 
-static int rna_Image_gl_touch(Image *image,
-                              ReportList *reports,
-                              int UNUSED(frame),
-                              int UNUSED(layer_index),
-                              int UNUSED(pass_index))
+static int rna_Image_gl_touch(
+    Image *image, ReportList *reports, int frame, int layer_index, int pass_index)
 {
-  int error = 0; /* GL_NO_ERROR */
-
   BKE_image_tag_time(image);
   BKE_image_partial_update_mark_full_update(image);
-
-  return error;
+  return rna_Image_gl_load(image, reports, frame, layer_index, pass_index);
 }
 
 static void rna_Image_gl_free(Image *image)



More information about the Bf-blender-cvs mailing list