[Bf-blender-cvs] [1dba2cd] wiggly-widgets: Add second widget call in-scene

[Antony Riakiotakis]

Commit: 1dba2cd025ec1d3dd9c26bd09dd59c459015836e
Author: Antony Riakiotakis
Date:   Tue Feb 10 16:12:26 2015 +0100
Branches: wiggly-widgets
https://developer.blender.org/rB1dba2cd025ec1d3dd9c26bd09dd59c459015836e

Add second widget call in-scene

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

M       source/blender/editors/space_view3d/view3d_draw.c
M       source/blender/windowmanager/intern/wm_widgets.c

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

diff --git a/source/blender/editors/space_view3d/view3d_draw.c 
b/source/blender/editors/space_view3d/view3d_draw.c
index 479e865..20f77c2 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3488,6 +3488,8 @@ static void view3d_main_area_draw_objects(const bContext 
*C, Scene *scene, View3
        /* main drawing call */
        view3d_draw_objects(C, scene, v3d, ar, grid_unit, true, false);
        
+       WM_widgets_draw(C, ar->widgetmaps.first, true);
+
        /* Disable back anti-aliasing */
        if (U.ogl_multisamples != USER_MULTISAMPLE_NONE) {
                glDisable(GL_MULTISAMPLE_ARB);
@@ -3598,6 +3600,8 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
        render_border = ED_view3d_calc_render_border(scene, v3d, ar, 
&border_rect);
        clip_border = (render_border && !BLI_rcti_compare(&ar->drawrct, 
&border_rect));
 
+       WM_widgets_update(C, ar->widgetmaps.first);
+
        /* draw viewport using opengl */
        if (v3d->drawtype != OB_RENDER || 
!view3d_main_area_do_render_draw(scene) || clip_border) {
                view3d_main_area_draw_objects(C, scene, v3d, ar, &grid_unit);
@@ -3617,7 +3621,6 @@ void view3d_main_area_draw(const bContext *C, ARegion *ar)
        
        view3d_main_area_setup_view(scene, v3d, ar, NULL, NULL);
        glClear(GL_DEPTH_BUFFER_BIT);
-       WM_widgets_update(C, ar->widgetmaps.first);
        WM_widgets_draw(C, ar->widgetmaps.first, false);
        BIF_draw_manipulator(C);
        ED_region_pixelspace(ar);
diff --git a/source/blender/windowmanager/intern/wm_widgets.c 
b/source/blender/windowmanager/intern/wm_widgets.c
index e9aeb04..0ae9828 100644
--- a/source/blender/windowmanager/intern/wm_widgets.c
+++ b/source/blender/windowmanager/intern/wm_widgets.c
@@ -574,8 +574,8 @@ static int wm_widget_find_highlighted_3D_intern (ListBase 
*visible_widgets, bCon
        if (hits == 1) {
                return buffer[3];
 
-               /* find the widget the value belongs to */              
        }
+       /* find the widget the value belongs to */
        else if (hits > 1) {
                GLuint val, dep, mindep = 0, minval = -1;
                int a;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs