[Bf-blender-cvs] [cb15854bf91] blender2.8: Fix missing uniform for vert/weight/texture paint

[Campbell Barton]

Commit: cb15854bf91e0d5229d73b5859b5e132a55217b0
Author: Campbell Barton
Date:   Wed Aug 8 15:08:50 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBcb15854bf91e0d5229d73b5859b5e132a55217b0

Fix missing uniform for vert/weight/texture paint

Entering any of these modes would assert immediately.

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

M       source/blender/draw/modes/paint_texture_mode.c
M       source/blender/draw/modes/paint_vertex_mode.c
M       source/blender/draw/modes/paint_weight_mode.c

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

diff --git a/source/blender/draw/modes/paint_texture_mode.c 
b/source/blender/draw/modes/paint_texture_mode.c
index 8256bb4d0d7..cf8e520323e 100644
--- a/source/blender/draw/modes/paint_texture_mode.c
+++ b/source/blender/draw/modes/paint_texture_mode.c
@@ -227,6 +227,7 @@ static void PAINT_TEXTURE_cache_init(void *vedata)
                                                DRWShadingGroup *grp = 
DRW_shgroup_create(e_data.image_sh, psl->image_faces);
                                                
DRW_shgroup_uniform_texture(grp, "image", tex);
                                                DRW_shgroup_uniform_float(grp, 
"alpha", &draw_ctx->v3d->overlay.texture_paint_mode_opacity, 1);
+                                               DRW_shgroup_uniform_block(grp, 
"globalsBlock", globals_ubo);
                                                
stl->g_data->shgroup_image_array[i] = grp;
                                        }
                                        else {
@@ -259,6 +260,7 @@ static void PAINT_TEXTURE_cache_init(void *vedata)
                        DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | 
DRW_STATE_DEPTH_LESS_EQUAL);
 
                stl->g_data->lwire_shgrp = 
DRW_shgroup_create(e_data.wire_overlay_shader, psl->wire_overlay);
+               DRW_shgroup_uniform_block(stl->g_data->lwire_shgrp, 
"globalsBlock", globals_ubo);
        }
 
        {
diff --git a/source/blender/draw/modes/paint_vertex_mode.c 
b/source/blender/draw/modes/paint_vertex_mode.c
index 33af72e8616..bbe17415da1 100644
--- a/source/blender/draw/modes/paint_vertex_mode.c
+++ b/source/blender/draw/modes/paint_vertex_mode.c
@@ -125,6 +125,7 @@ static void PAINT_VERTEX_cache_init(void *vedata)
                        DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | 
DRW_STATE_DEPTH_LESS_EQUAL);
 
                stl->g_data->lwire_shgrp = 
DRW_shgroup_create(e_data.wire_overlay_shader, psl->wire_overlay);
+               DRW_shgroup_uniform_block(stl->g_data->lwire_shgrp, 
"globalsBlock", globals_ubo);
        }
 
        {
diff --git a/source/blender/draw/modes/paint_weight_mode.c 
b/source/blender/draw/modes/paint_weight_mode.c
index d4fc73e7f88..3bbe8911491 100644
--- a/source/blender/draw/modes/paint_weight_mode.c
+++ b/source/blender/draw/modes/paint_weight_mode.c
@@ -154,6 +154,7 @@ static void PAINT_WEIGHT_cache_init(void *vedata)
                        DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | 
DRW_STATE_DEPTH_LESS_EQUAL);
 
                stl->g_data->lwire_shgrp = 
DRW_shgroup_create(e_data.wire_overlay_shader, psl->wire_overlay);
+               DRW_shgroup_uniform_block(stl->g_data->lwire_shgrp, 
"globalsBlock", globals_ubo);
        }
 
        {
@@ -173,6 +174,7 @@ static void PAINT_WEIGHT_cache_init(void *vedata)
                        DRW_STATE_WRITE_COLOR | DRW_STATE_WRITE_DEPTH | 
DRW_STATE_DEPTH_LESS_EQUAL);
 
                stl->g_data->vert_shgrp = 
DRW_shgroup_create(e_data.vert_overlay_shader, psl->vert_overlay);
+               DRW_shgroup_uniform_block(stl->g_data->vert_shgrp, 
"globalsBlock", globals_ubo);
        }
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs