[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44873] trunk/blender/source/blender: Fix some errors in partial visibility drawing.
Nicholas Bishop
nicholasbishop at gmail.com
Wed Mar 14 08:37:58 CET 2012
Revision: 44873
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44873
Author: nicholasbishop
Date: 2012-03-14 07:37:47 +0000 (Wed, 14 Mar 2012)
Log Message:
-----------
Fix some errors in partial visibility drawing.
Also changed show-in-border key to SHIFT+H as suggested by Daniel
Salazar.
Modified Paths:
--------------
trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c 2012-03-14 06:32:43 UTC (rev 44872)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c 2012-03-14 07:37:47 UTC (rev 44873)
@@ -528,7 +528,7 @@
wmKeyMapItem *kmi;
/* Partial visiblity */
- kmi= WM_keymap_add_item(keymap, "PAINT_OT_hide_show", HKEY, KM_PRESS, KM_CTRL, 0);
+ kmi= WM_keymap_add_item(keymap, "PAINT_OT_hide_show", HKEY, KM_PRESS, KM_SHIFT, 0);
RNA_enum_set(kmi->ptr, "action", PARTIALVIS_SHOW);
RNA_enum_set(kmi->ptr, "area", PARTIALVIS_INSIDE);
kmi= WM_keymap_add_item(keymap, "PAINT_OT_hide_show", HKEY, KM_PRESS, 0, 0);
Modified: trunk/blender/source/blender/gpu/intern/gpu_buffers.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_buffers.c 2012-03-14 06:32:43 UTC (rev 44872)
+++ trunk/blender/source/blender/gpu/intern/gpu_buffers.c 2012-03-14 07:37:47 UTC (rev 44873)
@@ -1479,7 +1479,7 @@
/* grid hidden are present, have to check each element */
for(y = 0; y < gridsize-1; y++) {
for(x = 0; x < gridsize-1; x++) {
- if(paint_is_grid_face_hidden(gh, gridsize, x, y))
+ if(!paint_is_grid_face_hidden(gh, gridsize, x, y))
totquad++;
}
}
@@ -1595,7 +1595,7 @@
{
GPU_Buffers *buffers;
int totquad;
- int fully_visible_totquad = (gridsize-1) * (gridsize-1);
+ int fully_visible_totquad = (gridsize-1) * (gridsize-1) * totgrid;
buffers = MEM_callocN(sizeof(GPU_Buffers), "GPU_Buffers");
buffers->grid_hidden = grid_hidden;
@@ -1609,7 +1609,7 @@
gpu_get_grid_buffer(gridsize, &buffers->index_type, &buffers->tot_quad);
buffers->has_hidden = 0;
}
- else if(!GLEW_ARB_vertex_buffer_object || (U.gameflags & USER_DISABLE_VBO)) {
+ else if(GLEW_ARB_vertex_buffer_object && !(U.gameflags & USER_DISABLE_VBO)) {
/* Build new VBO */
glGenBuffersARB(1, &buffers->index_buf);
if(buffers->index_buf) {
More information about the Bf-blender-cvs
mailing list