Merge branch 'master' into blender2.8
[blender.git] / source / blender / makesrna / intern / rna_image_api.c
index cb8fa6c..3916443 100644 (file)
@@ -56,9 +56,6 @@
 #include "IMB_imbuf.h"
 #include "IMB_colormanagement.h"
 
-#include "GPU_draw.h"
-#include "GPU_debug.h"
-
 #include "DNA_image_types.h"
 #include "DNA_scene_types.h"
 
@@ -251,6 +248,8 @@ static int rna_Image_gl_load(Image *image, ReportList *reports, int frame, int f
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, (GLint)filter);
        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, (GLint)mag);
 
+       /* TODO(merwin): validate input (dimensions, filter, mag) before calling OpenGL
+        *               instead of trusting input & testing for error after */
        error = glGetError();
 
        if (error) {