[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37363] trunk/blender/source: fix [#27607] Scene's render.filepath gets cropped to 159 characters

[Campbell Barton]

Revision: 37363
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37363
Author:   campbellbarton
Date:     2011-06-10 10:13:50 +0000 (Fri, 10 Jun 2011)
Log Message:
-----------
fix [#27607] Scene's render.filepath gets cropped to 159 characters
use 240 char limit, remove backbuffer path which wasn't used.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/blender.c
    trunk/blender/source/blender/blenkernel/intern/scene.c
    trunk/blender/source/blender/makesdna/DNA_scene_types.h
    trunk/blender/source/blender/makesdna/DNA_userdef_types.h
    trunk/blender/source/blender/render/intern/source/pipeline.c
    trunk/blender/source/creator/creator.c

Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c	2011-06-10 09:44:27 UTC (rev 37362)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c	2011-06-10 10:13:50 UTC (rev 37363)
@@ -180,7 +180,6 @@
 	BLI_bpathIterator_free(bpi);
 
 	for(scene= main->scene.first; scene; scene= scene->id.next) {
-		BLI_clean(scene->r.backbuf);
 		BLI_clean(scene->r.pic);
 	}
 }

Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c	2011-06-10 09:44:27 UTC (rev 37362)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c	2011-06-10 10:13:50 UTC (rev 37363)
@@ -476,8 +476,7 @@
 	sce->audio.doppler_factor = 1.0;
 	sce->audio.speed_of_sound = 343.3;
 
-	strcpy(sce->r.backbuf, "//backbuf");
-	strcpy(sce->r.pic, U.renderdir);
+	BLI_strncpy(sce->r.pic, U.renderdir, sizeof(sce->r.pic));
 
 	BLI_init_rctf(&sce->r.safety, 0.1f, 0.9f, 0.1f, 0.9f);
 	sce->r.osa= 8;

Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h	2011-06-10 09:44:27 UTC (rev 37362)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h	2011-06-10 10:13:50 UTC (rev 37363)
@@ -350,7 +350,7 @@
 	float bake_maxdist, bake_biasdist, bake_pad;
 
 	/* paths to backbufffer, output */
-	char backbuf[160], pic[160];
+	char pic[240];
 
 	/* stamps flags. */
 	int stamp;

Modified: trunk/blender/source/blender/makesdna/DNA_userdef_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2011-06-10 09:44:27 UTC (rev 37362)
+++ trunk/blender/source/blender/makesdna/DNA_userdef_types.h	2011-06-10 10:13:50 UTC (rev 37363)
@@ -305,7 +305,7 @@
 	int savetime;
 	char tempdir[160];	// FILE_MAXDIR length
 	char fontdir[160];
-	char renderdir[160];
+	char renderdir[240]; // FILE_MAX length
 	char textudir[160];
 	char plugtexdir[160];
 	char plugseqdir[160];

Modified: trunk/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pipeline.c	2011-06-10 09:44:27 UTC (rev 37362)
+++ trunk/blender/source/blender/render/intern/source/pipeline.c	2011-06-10 10:13:50 UTC (rev 37363)
@@ -2070,8 +2070,7 @@
 	if(re->r.alphamode == R_ADDSKY) {
 		ImBuf *ibuf;
 		char name[256];
-		
-		BLI_strncpy(name, re->r.backbuf, sizeof(name));
+
 		BLI_path_abs(name, re->main->name);
 		BLI_path_frame(name, re->r.cfra, 0);
 		

Modified: trunk/blender/source/creator/creator.c
===================================================================
--- trunk/blender/source/creator/creator.c	2011-06-10 09:44:27 UTC (rev 37362)
+++ trunk/blender/source/creator/creator.c	2011-06-10 10:13:50 UTC (rev 37363)
@@ -538,7 +538,7 @@
 	if (argc >= 1){
 		if (CTX_data_scene(C)) {
 			Scene *scene= CTX_data_scene(C);
-			BLI_strncpy(scene->r.pic, argv[1], FILE_MAXDIR);
+			BLI_strncpy(scene->r.pic, argv[1], sizeof(scene->r.pic));
 		} else {
 			printf("\nError: no blend loaded. cannot use '-o / --render-output'.\n");
 		}