[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54717] trunk/blender/source/blender: Increase maximum render resolution from 10000 to 65536.
Brecht Van Lommel
brechtvanlommel at pandora.be
Thu Feb 21 19:07:56 CET 2013
Revision: 54717
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54717
Author: blendix
Date: 2013-02-21 18:07:56 +0000 (Thu, 21 Feb 2013)
Log Message:
-----------
Increase maximum render resolution from 10000 to 65536.
Modified Paths:
--------------
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesrna/intern/rna_image.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h 2013-02-21 17:52:07 UTC (rev 54716)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h 2013-02-21 18:07:56 UTC (rev 54717)
@@ -389,15 +389,19 @@
short filtertype; /* filter is box, tent, gauss, mitch, etc */
short size, maximsize; /* size in %, max in Kb */
+
+ short pad6;
+
/* from buttons: */
/**
* The desired number of pixels in the x direction
*/
- short xsch;
+ int xsch;
/**
* The desired number of pixels in the y direction
*/
- short ysch;
+ int ysch;
+
/**
* The number of part to use in the x direction
*/
@@ -410,7 +414,7 @@
/**
* render tile dimensions
*/
- short tilex, tiley;
+ int tilex, tiley;
short planes DNA_DEPRECATED, imtype DNA_DEPRECATED, subimtype DNA_DEPRECATED, quality DNA_DEPRECATED; /*deprecated!*/
@@ -418,6 +422,7 @@
* Render to image editor, fullscreen or to new window.
*/
short displaymode;
+ short pad7;
/**
* Flags for render settings. Use bit-masking to access the settings.
@@ -458,8 +463,6 @@
short frs_sec, edgeint;
- int pad;
-
/* safety, border and display rect */
rctf safety, border;
Modified: trunk/blender/source/blender/makesrna/intern/rna_image.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_image.c 2013-02-21 17:52:07 UTC (rev 54716)
+++ trunk/blender/source/blender/makesrna/intern/rna_image.c 2013-02-21 18:07:56 UTC (rev 54717)
@@ -584,14 +584,14 @@
prop = RNA_def_property(srna, "generated_width", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "gen_x");
- RNA_def_property_range(prop, 1, 16384);
+ RNA_def_property_range(prop, 1, 65536);
RNA_def_property_ui_text(prop, "Generated Width", "Generated image width");
RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY, "rna_Image_generated_update");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
prop = RNA_def_property(srna, "generated_height", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "gen_y");
- RNA_def_property_range(prop, 1, 16384);
+ RNA_def_property_range(prop, 1, 65536);
RNA_def_property_ui_text(prop, "Generated Height", "Generated image height");
RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY, "rna_Image_generated_update");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2013-02-21 17:52:07 UTC (rev 54716)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2013-02-21 18:07:56 UTC (rev 54717)
@@ -3454,14 +3454,14 @@
prop = RNA_def_property(srna, "resolution_x", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "xsch");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
- RNA_def_property_range(prop, 4, 10000);
+ RNA_def_property_range(prop, 4, 65536);
RNA_def_property_ui_text(prop, "Resolution X", "Number of horizontal pixels in the rendered image");
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneCamera_update");
prop = RNA_def_property(srna, "resolution_y", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "ysch");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
- RNA_def_property_range(prop, 4, 10000);
+ RNA_def_property_range(prop, 4, 65536);
RNA_def_property_ui_text(prop, "Resolution Y", "Number of vertical pixels in the rendered image");
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, "rna_SceneCamera_update");
@@ -3475,13 +3475,13 @@
prop = RNA_def_property(srna, "tile_x", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "tilex");
- RNA_def_property_range(prop, 8, 10000);
+ RNA_def_property_range(prop, 8, 65536);
RNA_def_property_ui_text(prop, "Tile X", "Horizontal tile size to use while rendering");
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
prop = RNA_def_property(srna, "tile_y", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "tiley");
- RNA_def_property_range(prop, 8, 10000);
+ RNA_def_property_range(prop, 8, 65536);
RNA_def_property_ui_text(prop, "Tile Y", "Vertical tile size to use while rendering");
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
More information about the Bf-blender-cvs
mailing list