merge with trunk at r31523
[blender.git] / source / blender / editors / space_view3d / view3d_draw.c
index 048a0d956175345ff4a71513bd92fc9f390a647f..d56b2c3577304afed4019d7bbe9636ac30467ac7 100644 (file)
 #include "BKE_global.h"
 #include "BKE_paint.h"
 #include "BKE_scene.h"
+#include "BKE_screen.h"
+#include "BKE_tessmesh.h"
 #include "BKE_unit.h"
+#include "BKE_utildefines.h"
 
 #include "RE_pipeline.h"       // make_stars
 
@@ -1940,7 +1943,7 @@ static void view3d_main_area_setup_view(Scene *scene, View3D *v3d, ARegion *ar,
        if(viewmat)
                copy_m4_m4(rv3d->viewmat, viewmat);
        else
-               setviewmatrixview3d(scene, v3d, rv3d);  /* note: calls where_is_object for camera... */
+       setviewmatrixview3d(scene, v3d, rv3d);  /* note: calls where_is_object for camera... */
        
        /* update utilitity matrices */
        mul_m4_m4m4(rv3d->persmat, rv3d->viewmat, rv3d->winmat);
@@ -2023,10 +2026,10 @@ void ED_view3d_draw_offscreen(Scene *scene, View3D *v3d, ARegion *ar, int winx,
                        if(v3d->lay & base->lay) {
                                UI_ThemeColorBlend(TH_WIRE, TH_BACK, 0.6f);
                                draw_object(scene, ar, v3d, base, DRAW_CONSTCOLOR|DRAW_SCENESET);
-                               
+               
                                if(base->object->transflag & OB_DUPLI)
                                        draw_dupli_objects_color(scene, ar, v3d, base, TH_WIRE);
-                       }
+       }
                }
        }