[Bf-blender-cvs] [3e5475d12ee] greasepencil-refactor: Merge branch 'greasepencil-object' into greasepencil-refactor

[Antonio Vazquez]

Commit: 3e5475d12ee46f6269213d29b2f761fb014f21f0
Author: Antonio Vazquez
Date:   Wed Jan 15 08:48:43 2020 +0100
Branches: greasepencil-refactor
https://developer.blender.org/rB3e5475d12ee46f6269213d29b2f761fb014f21f0

Merge branch 'greasepencil-object' into greasepencil-refactor

 Conflicts:
	source/blender/draw/engines/overlay/shaders/outline_prepass_frag.glsl
	source/blender/draw/intern/draw_manager_exec.c
	source/blender/editors/gpencil/drawgpencil.c

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



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

diff --cc source/blender/editors/gpencil/drawgpencil.c
index 599624f6359,e0310a00886..a6151406578
--- a/source/blender/editors/gpencil/drawgpencil.c
+++ b/source/blender/editors/gpencil/drawgpencil.c
@@@ -374,48 -375,10 +374,10 @@@ static void gp_add_filldata_tobuffer(co
      fpt[2] = 0.0f; /* 2d always is z=0.0f */
    }
  
 -  immAttr2f(texcoord, uv[0], uv[1]); /* texture coordinates */
 -  immVertex3fv(pos, fpt);            /* position */
 +  immAttr2f(texcoord, pt->uv_fill[0], pt->uv_fill[1]); /* texture coordinates */
 +  immVertex3fv(pos, fpt);                              /* position */
  }
  
- #if 0 /* GPXX disabled, not used in annotations */
- /* assign image texture for filling stroke */
- static int gp_set_filling_texture(Image *image, short flag)
- {
-   ImBuf *ibuf;
-   uint *bind = &image->bindcode[TEXTARGET_TEXTURE_2D];
-   int error = GL_NO_ERROR;
-   ImageUser iuser = {NULL};
-   void *lock;
- 
-   iuser.ok = true;
- 
-   ibuf = BKE_image_acquire_ibuf(image, &iuser, &lock);
- 
-   if (ibuf == NULL || ibuf->rect == NULL) {
-     BKE_image_release_ibuf(image, ibuf, NULL);
-     return (int)GL_INVALID_OPERATION;
-   }
- 
-   GPU_create_gl_tex(
-       bind, ibuf->rect, ibuf->rect_float, ibuf->x, ibuf->y, GL_TEXTURE_2D, false, false, image);
- 
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-   if (flag & GP_MATERIAL_TEX_CLAMP) {
-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
-   }
-   else {
-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-   }
-   BKE_image_release_ibuf(image, ibuf, NULL);
- 
-   return error;
- }
- #endif
- 
  /* draw fills for shapes */
  static void gp_draw_stroke_fill(bGPdata *gpd,
                                  bGPDstroke *gps,