Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / scene.c
index 1a452fbdc96e85fddab65754262b15a2d4f63abe..e06c7a43dd81cdae39b24bd2b7acfbf1c6bb4ea4 100644 (file)
 
 #include "bmesh.h"
 
-#ifdef WIN32
-#else
-#  include <sys/time.h>
-#endif
-
 const char *RE_engine_id_BLENDER_RENDER = "BLENDER_RENDER";
 const char *RE_engine_id_BLENDER_GAME = "BLENDER_GAME";
 const char *RE_engine_id_CYCLES = "CYCLES";
@@ -547,7 +542,7 @@ void BKE_scene_init(Scene *sce)
        sce->r.bake.im_format.compress = 15;
 
        sce->r.scemode = R_DOCOMP | R_DOSEQ | R_EXTENSION;
-       sce->r.stamp = R_STAMP_TIME | R_STAMP_FRAME | R_STAMP_DATE | R_STAMP_CAMERA | R_STAMP_SCENE | R_STAMP_FILENAME | R_STAMP_RENDERTIME;
+       sce->r.stamp = R_STAMP_TIME | R_STAMP_FRAME | R_STAMP_DATE | R_STAMP_CAMERA | R_STAMP_SCENE | R_STAMP_FILENAME | R_STAMP_RENDERTIME | R_STAMP_MEMORY;
        sce->r.stamp_font_id = 12;
        sce->r.fg_stamp[0] = sce->r.fg_stamp[1] = sce->r.fg_stamp[2] = 0.8f;
        sce->r.fg_stamp[3] = 1.0f;
@@ -2409,7 +2404,6 @@ SceneRenderView *BKE_scene_multiview_render_view_findindex(const RenderData *rd,
        if ((rd->scemode & R_MULTIVIEW) == 0)
                return NULL;
 
-       nr = 0;
        for (srv = rd->views.first, nr = 0; srv; srv = srv->next) {
                if (BKE_scene_multiview_is_render_view_active(rd, srv)) {
                        if (nr++ == view_id)
@@ -2440,7 +2434,6 @@ int BKE_scene_multiview_view_id_get(const RenderData *rd, const char *viewname)
        if ((!viewname) || (!viewname[0]))
                return 0;
 
-       nr = 0;
        for (srv = rd->views.first, nr = 0; srv; srv = srv->next) {
                if (BKE_scene_multiview_is_render_view_active(rd, srv)) {
                        if (STREQ(viewname, srv->name)) {