[Bf-blender-cvs] [d412a5e6fa5] master: DRW: Fix crash drawing gpencil

[Clément Foucault]

Commit: d412a5e6fa53eec2ebde234f932c19d34f995fad
Author: Clément Foucault
Date:   Wed Aug 19 11:53:54 2020 +0200
Branches: master
https://developer.blender.org/rBd412a5e6fa53eec2ebde234f932c19d34f995fad

DRW: Fix crash drawing gpencil

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

M	source/blender/draw/intern/draw_manager_exec.c

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

diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index 47892b958d0..44e2eec04d9 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -774,7 +774,7 @@ static void draw_call_resource_bind(DRWCommandsState *state, const DRWResourceHa
   int chunk = DRW_handle_chunk_get(handle);
   if (state->resource_chunk != chunk) {
     if (state->chunkid_loc != -1) {
-      GPU_shader_uniform_int(NULL, state->chunkid_loc, chunk);
+      GPU_shader_uniform_int(DST.shader, state->chunkid_loc, chunk);
     }
     if (state->obmats_loc != -1) {
       GPU_uniformbuffer_unbind(DST.vmempool->matrices_ubo[state->resource_chunk]);
@@ -790,7 +790,7 @@ static void draw_call_resource_bind(DRWCommandsState *state, const DRWResourceHa
   if (state->resourceid_loc != -1) {
     int id = DRW_handle_id_get(handle);
     if (state->resource_id != id) {
-      GPU_shader_uniform_int(NULL, state->resourceid_loc, id);
+      GPU_shader_uniform_int(DST.shader, state->resourceid_loc, id);
       state->resource_id = id;
     }
   }