[Bf-blender-cvs] [ee364b6] master: Fix T47940: Custom bone shapes, select error w/ Open NVidia drivers

[Campbell Barton]

Commit: ee364b63582c606977cc7dc54435d02fb9e1981c
Author: Campbell Barton
Date:   Thu Mar 31 00:55:48 2016 +1100
Branches: master
https://developer.blender.org/rBee364b63582c606977cc7dc54435d02fb9e1981c

Fix T47940: Custom bone shapes, select error w/ Open NVidia drivers

Latest nouveau drivers have a bug here, use occlusion queries.

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

M	source/blender/gpu/intern/gpu_select.c

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

diff --git a/source/blender/gpu/intern/gpu_select.c b/source/blender/gpu/intern/gpu_select.c
index d7b1977..5858223 100644
--- a/source/blender/gpu/intern/gpu_select.c
+++ b/source/blender/gpu/intern/gpu_select.c
@@ -255,5 +255,8 @@ bool GPU_select_query_check_active(void)
 {
 	return ((U.gpu_select_method == USER_SELECT_USE_OCCLUSION_QUERY) ||
 	        ((U.gpu_select_method == USER_SELECT_AUTO) &&
-	         GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_ANY, GPU_DRIVER_ANY)));
+	         (GPU_type_matches(GPU_DEVICE_ATI, GPU_OS_ANY, GPU_DRIVER_ANY) ||
+	          /* unsupported by nouveau, gallium 0.4, see: T47940 */
+	          GPU_type_matches(GPU_DEVICE_NVIDIA, GPU_OS_UNIX, GPU_DRIVER_OPENSOURCE))));
+
 }