Commit: 6bd53cb5411b10a97d0f1375944928ce5d58c6ce
Author: Campbell Barton
Date: Wed Feb 28 11:46:02 2018 +1100
Branches: master
https://developer.blender.org/rB6bd53cb5411b10a97d0f1375944928ce5d58c6ce
Cleanup: comment for depth picking code, const args
Note that setting `glDepthFunc` isn't important,
since 2.8 branch changes this value it might seem like an error
however it's harmless in this case - so better make note of this.
===================================================================
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/gpu/intern/gpu_select_pick.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_draw.c
b/source/blender/editors/space_view3d/view3d_draw.c
index 94c7ff5a051..7e613e36119 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -861,7 +861,7 @@ static void draw_viewport_name(ARegion *ar, View3D *v3d,
rcti *rect)
* framenum, object name, bone name (if available), marker name (if available)
*/
-static void draw_selected_name(Scene *scene, Object *ob, rcti *rect)
+static void draw_selected_name(Scene *scene, Object *ob, const rcti *rect)
{
const int cfra = CFRA;
const char *msg_pin = " (Pinned)";
diff --git a/source/blender/editors/space_view3d/view3d_select.c
b/source/blender/editors/space_view3d/view3d_select.c
index 68c35115584..4e96ea63808 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -1114,7 +1114,7 @@ static Base *object_mouse_select_menu(
}
}
-static bool selectbuffer_has_bones(const unsigned int *buffer, const unsigned
int hits)
+static bool selectbuffer_has_bones(const uint *buffer, const uint hits)
{
unsigned int i;
for (i = 0; i < hits; i++) {
@@ -1235,8 +1235,9 @@ finally:
}
/* returns basact */
-static Base *mouse_select_eval_buffer(ViewContext *vc, unsigned int *buffer,
int hits,
- Base *startbase, bool has_bones, bool
do_nearest)
+static Base *mouse_select_eval_buffer(
+ ViewContext *vc, const uint *buffer, int hits,
+ Base *startbase, bool has_bones, bool do_nearest)
{
Scene *scene = vc->scene;
View3D *v3d = vc->v3d;
diff --git a/source/blender/gpu/intern/gpu_select_pick.c
b/source/blender/gpu/intern/gpu_select_pick.c
index 7657d329b8a..703035483dd 100644
--- a/source/blender/gpu/intern/gpu_select_pick.c
+++ b/source/blender/gpu/intern/gpu_select_pick.c
@@ -326,6 +326,9 @@ void gpu_select_pick_begin(
glDepthMask(GL_TRUE);
if (mode == GPU_SELECT_PICK_ALL) {
+ /* Note that other depth settings (such as #GL_LEQUAL)
work too,
+ * since the depth is always cleared.
+ * Noting this for cases when depth picking is used
where drawing calls change depth settings. */
glDepthFunc(GL_ALWAYS);
}
else {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
