Commit: 12c56d8c1f7318ddbd9782f25b871d4b09bad258
Author: Sergey Sharybin
Date: Tue Mar 11 12:55:53 2014 +0600
https://developer.blender.org/rB12c56d8c1f7318ddbd9782f25b871d4b09bad258
Fix T39101: Can not select object on backface by clicking when Matcap is on
===================================================================
M source/blender/editors/space_view3d/drawobject.c
===================================================================
diff --git a/source/blender/editors/space_view3d/drawobject.c
b/source/blender/editors/space_view3d/drawobject.c
index c1adbaf..47ec3d8 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -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);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
