archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Object Mode: Fix wrong wire color on non-meshes objects.

Browse Source
This commit is contained in:
Clément Foucault
2018-04-17 17:00:24 +02:00
parent 088b6342e6
commit c6681f735e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/draw/intern/draw_common.c
View File

@@ -162,6 +162,7 @@ static struct {
struct Gwn_VertFormat *instance_screen_aligned;
struct Gwn_VertFormat *instance_scaled;
struct Gwn_VertFormat *instance_sized;
struct Gwn_VertFormat *instance_outline;
struct Gwn_VertFormat *instance;
struct Gwn_VertFormat *instance_camera;
struct Gwn_VertFormat *instance_distance_lines;
@@ -336,13 +337,13 @@ DRWShadingGroup *shgroup_instance_outline(DRWPass *pass, struct Gwn_Batch *geom,
{
GPUShader *sh_inst = GPU_shader_get_builtin_shader(GPU_SHADER_INSTANCE_VARIYING_ID_VARIYING_SIZE);
DRW_shgroup_instance_format(g_formats.instance_sized, {
DRW_shgroup_instance_format(g_formats.instance_outline, {
{"callId" , DRW_ATTRIB_INT, 1},
{"size" , DRW_ATTRIB_FLOAT, 1},
{"InstanceModelMatrix", DRW_ATTRIB_FLOAT, 16}
});
DRWShadingGroup *grp = DRW_shgroup_instance_create(sh_inst, pass, geom, g_formats.instance_sized);
DRWShadingGroup *grp = DRW_shgroup_instance_create(sh_inst, pass, geom, g_formats.instance_outline);
DRW_shgroup_uniform_int(grp, "baseId", baseid, 1);
return grp;