[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26556] trunk/blender/source/blender: Give border render coordinates a sane default, so enabling border in the

[Brecht Van Lommel]

Revision: 26556
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26556
Author:   blendix
Date:     2010-02-02 18:28:53 +0100 (Tue, 02 Feb 2010)

Log Message:
-----------
Give border render coordinates a sane default, so enabling border in the
render properties shows the render border in the 3d view.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/scene.c
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c	2010-02-02 17:19:12 UTC (rev 26555)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c	2010-02-02 17:28:53 UTC (rev 26556)
@@ -367,6 +367,11 @@
 	sce->r.cineonblack= 95;
 	sce->r.cineonwhite= 685;
 	sce->r.cineongamma= 1.7f;
+
+	sce->r.border.xmin= 0.0f;
+	sce->r.border.ymin= 0.0f;
+	sce->r.border.xmax= 1.0f;
+	sce->r.border.ymax= 1.0f;
 	
 	sce->toolsettings = MEM_callocN(sizeof(struct ToolSettings),"Tool Settings Struct");
 	sce->toolsettings->cornertype=1;

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2010-02-02 17:19:12 UTC (rev 26555)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2010-02-02 17:28:53 UTC (rev 26556)
@@ -10654,10 +10654,21 @@
 	}
 	
 	/* put 2.50 compatibility code here until next subversion bump */
-	//{
-	
-	//}
+	{
+		Scene *sce;
 
+		/* initialize to sane default so toggling on border shows something */
+		for(sce = main->scene.first; sce; sce = sce->id.next) {
+			if(sce->r.border.xmin == 0.0f && sce->r.border.ymin == 0.0f &&
+			   sce->r.border.xmax == 0.0f && sce->r.border.ymax == 0.0f) {
+				sce->r.border.xmin= 0.0f;
+				sce->r.border.ymin= 0.0f;
+				sce->r.border.xmax= 1.0f;
+				sce->r.border.ymax= 1.0f;
+			}
+		}
+	}
+
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
 	/* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */