blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Fix T58551: Dragged in images do not display orange highlight border when selected

This commit is contained in:
Clément Foucault 2018-12-05 03:45:02 +01:00
parent b4d192def8
commit 1dac00f7ad
Notes: blender-bot 2023-02-14 06:00:44 +01:00 
Referenced by issue #58551, Dragged in images do not display orange highlight border when selected
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/draw/modes/object_mode.c
View File

@ -895,7 +895,7 @@ static void DRW_shgroup_empty_image(
DRW_shgroup_uniform_int_copy(grp, "depthMode", ob->empty_image_depth);
DRW_shgroup_uniform_float(grp, "size", &ob->empty_drawsize, 1);
DRW_shgroup_uniform_vec2(grp, "offset", ob->ima_ofs, 1);
DRW_shgroup_uniform_vec4(grp, "color", color, 1);
DRW_shgroup_uniform_vec3(grp, "color", color, 1);
DRW_shgroup_call_add(grp, DRW_cache_image_plane_wire_get(), ob->obmat);
}
}

1
source/blender/draw/modes/shaders/object_empty_image_vert.glsl
View File

@ -24,6 +24,7 @@ void main()
(pos + offset) * (size * vec2(aspectX, aspectY)),
0.0, 1.0);
#ifdef USE_WIRE
gl_Position.z -= 1e-5;
finalColor = vec4(color, 1.0);
#else
texCoord_interp = texCoord;