blender
/
blender
130
398
Fork 574
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fix T39101: Can not select object on backface by clicking when Matcap is on

This commit is contained in:
Sergey Sharybin 2014-03-11 12:55:53 +06:00
parent 41dde55325
commit 12c56d8c1f
Notes: blender-bot 2023-02-14 11:01:31 +01:00 
Referenced by issue #39101, Can not select object on backface by clicking when Matcap is on
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/space_view3d/drawobject.c
View File

@ -6704,6 +6704,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
bool zbufoff = false, is_paint = false;
const bool is_obact = (ob == OBACT);
const bool render_override = (v3d->flag2 & V3D_RENDER_OVERRIDE) != 0;
const bool is_picking = (G.f & G_PICKSEL) != 0;
bool particle_skip_object = false; /* Draw particles but not their emitter object. */
/* only once set now, will be removed too, should become a global standard */
@ -6819,7 +6820,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short
}
/* matcap check - only when not painting color */
if ((v3d->flag2 & V3D_SOLID_MATCAP) && (dt == OB_SOLID) && (is_paint == false)) {
if ((v3d->flag2 & V3D_SOLID_MATCAP) && (dt == OB_SOLID) && (is_paint == false && is_picking == false)) {
draw_object_matcap_check(v3d, ob);
}