merge trunk 17122:17213

[blender-staging.git] / source / blender / src / drawview.c

diff --git a/source/blender/src/drawview.c b/source/blender/src/drawview.c
index cb3cb3379f1529294e2da33228f66d4654bc881c..dbc9dcfd805043ae96f3857d5b9eaade791ed744 100644 (file)
--- a/source/blender/src/drawview.c
+++ b/source/blender/src/drawview.c
@@ -155,7 +155,9 @@
 #include "BSE_time.h"
 #include "BSE_view.h"
 
+#ifndef DISABLE_PYTHON
 #include "BPY_extern.h"
+#endif
 
 #include "RE_render_ext.h"
 
@@ -167,6 +169,8 @@
 
 #include "RE_pipeline.h"       // make_stars
 
+#include "reeb.h"
+
 #include "GPU_draw.h"
 #include "GPU_material.h"
 
@@ -3299,6 +3303,8 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
                        BIF_drawPropCircle(); // only editmode and particles have proportional edit
                BIF_drawSnap();
        }
+       
+       REEB_draw();
 
        if(G.scene->radio) RAD_drawall(v3d->drawtype>=OB_SOLID);
        
@@ -3413,6 +3419,7 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
                }
        }
 
+#ifndef DISABLE_PYTHON
        /* run any view3d draw handler script links */
        if (sa->scriptlink.totscript)
                BPY_do_spacehandlers(sa, 0, 0, SPACEHANDLER_VIEW3D_DRAW);
@@ -3422,7 +3429,7 @@ void drawview3dspace(ScrArea *sa, void *spacedata)
                        !during_script()) {
                BPY_do_pyscript((ID *)G.scene, SCRIPT_REDRAW);
        }
-       
+#endif 
 }
 
 void drawview3d_render(struct View3D *v3d, float viewmat[][4], int winx, int winy, float winmat[][4], int shadow)