[Bf-blender-cvs] [c0d0ef142f] master: Cleanup: GPU_select never took NULL rect

Campbell Barton noreply at git.blender.org
Fri Mar 3 12:23:40 CET 2017


Commit: c0d0ef142fce15b839c369e9f7413c36b72aa8cb
Author: Campbell Barton
Date:   Fri Mar 3 15:40:54 2017 +1100
Branches: master
https://developer.blender.org/rBc0d0ef142fce15b839c369e9f7413c36b72aa8cb

Cleanup: GPU_select never took NULL rect

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

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 209496927d..f78191a6f6 100644
--- a/source/blender/gpu/intern/gpu_select.c
+++ b/source/blender/gpu/intern/gpu_select.c
@@ -109,12 +109,7 @@ void GPU_select_begin(unsigned int *buffer, unsigned int bufsize, const rctf *in
 		 * get rejected before the depth test. Should probably cull rect against
 		 * scissor for viewport but this is a rare case I think */
 		glGetFloatv(GL_SCISSOR_BOX, viewport);
-		if (!input || input->xmin == input->xmax) {
-			glViewport(viewport[0], viewport[1], 24, 24);
-		}
-		else {
-			glViewport(viewport[0], viewport[1], (int)(input->xmax - input->xmin), (int)(input->ymax - input->ymin));
-		}
+		glViewport(viewport[0], viewport[1], (int)(input->xmax - input->xmin), (int)(input->ymax - input->ymin));
 
 		/* occlusion queries operates on fragments that pass tests and since we are interested on all
 		 * objects in the view frustum independently of their order, we need to disable the depth test */




More information about the Bf-blender-cvs mailing list