diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h
index 9673d1e054f521730f183e486d83d588c7003d2f..1f6272342168a40c8def08a205d6f63f7f6b675b 100644
--- a/source/blender/include/blendef.h
+++ b/source/blender/include/blendef.h
@@ -42,7 +42,7 @@
 
 #define MAXLAMP		32765
 /* max length material array, 16 because of bits in matfrom */
-#define MAXPICKBUF      2000
+#define MAXPICKBUF      10000
 #define MAXSEQ          32
 /*  in Image struct */
 #define MAXMIPMAP       10
diff --git a/source/blender/src/view.c b/source/blender/src/view.c
index 2cec1433986504cf8a84c127322e2f652998fe44..cc4fd82bc2f2b2b79c5be90e2ac75d769c98871f 100644
--- a/source/blender/src/view.c
+++ b/source/blender/src/view.c
@@ -828,7 +828,7 @@ short selectprojektie(unsigned int *buffer, short x1, short y1, short x2, short
 	}
 	glPopName();	/* see above (pushname) */
 	hits= glRenderMode(GL_RENDER);
-	if(hits<0) error("Too many objects in selectbuf");
+	if(hits<0) error("Too many objects in select buffer");
 
 	G.f &= ~G_PICKSEL;
 	setwinmatrixview3d(0);