[Bf-blender-cvs] [056bb7721e5] master: Cleanup: remove unused scene struct members

[Campbell Barton]

Commit: 056bb7721e5d03aa03b1893cf62f30fe975c0d03
Author: Campbell Barton
Date:   Mon Sep 9 22:36:37 2019 +1000
Branches: master
https://developer.blender.org/rB056bb7721e5d03aa03b1893cf62f30fe975c0d03

Cleanup: remove unused scene struct members

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

M	source/blender/blenkernel/intern/scene.c
M	source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
M	source/blender/makesdna/DNA_scene_types.h

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index c55aa1b835c..8e728150ddf 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -772,8 +772,6 @@ void BKE_scene_init(Scene *sce)
 
   BLI_strncpy(sce->r.pic, U.renderdir, sizeof(sce->r.pic));
 
-  BLI_rctf_init(&sce->r.safety, 0.1f, 0.9f, 0.1f, 0.9f);
-
   /* Note; in header_info.c the scene copy happens...,
    * if you add more to renderdata it has to be checked there. */
 
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 98da8e8f6d3..eb4c16a7cfb 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -105,10 +105,6 @@ BlenderStrokeRenderer::BlenderStrokeRenderer(Render *re, int render_count) : Str
   freestyle_scene->r.border.xmax = old_scene->r.border.xmax;
   freestyle_scene->r.border.ymax = old_scene->r.border.ymax;
   strcpy(freestyle_scene->r.pic, old_scene->r.pic);
-  freestyle_scene->r.safety.xmin = old_scene->r.safety.xmin;
-  freestyle_scene->r.safety.ymin = old_scene->r.safety.ymin;
-  freestyle_scene->r.safety.xmax = old_scene->r.safety.xmax;
-  freestyle_scene->r.safety.ymax = old_scene->r.safety.ymax;
   freestyle_scene->r.dither_intensity = old_scene->r.dither_intensity;
   STRNCPY(freestyle_scene->r.engine, old_scene->r.engine);
   if (G.debug & G_DEBUG_FREESTYLE) {
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index aed78fe1a38..2a4ba7c7eaa 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -669,9 +669,8 @@ typedef struct RenderData {
 
   char _pad0[1];
 
-  /* safety, border and display rect */
-  rctf safety, border;
-  rcti disprect;
+  /** Render border to render sub-resions. */
+  rctf border;
 
   /* information on different layers to be rendered */
   /** Converted to Scene->view_layers. */