fix [#26152] Blender File for Image too Small
authorCampbell Barton <ideasman42@gmail.com>
Mon, 21 Feb 2011 01:02:30 +0000 (01:02 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 21 Feb 2011 01:02:30 +0000 (01:02 +0000)
disallow 0% rendersize.

also mark new cmake vars as advanced: RPMBUILD, X11_XF86keysym_INCLUDE_PATH

CMakeLists.txt
build_files/cmake/RpmBuild.cmake
source/blender/blenlib/intern/pbvh.c
source/blender/makesrna/intern/rna_scene.c

index 3952e48..e479618 100644 (file)
@@ -340,6 +340,7 @@ if(UNIX AND NOT APPLE)
 
        find_package(X11 REQUIRED)
        find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
+       mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
 
        # OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
        set(LLIBS "-lutil -lc -lm -lpthread -lstdc++ ${X11_X11_LIB} ${X11_Xinput_LIB}")
index 90f69d9..2c821a9 100644 (file)
@@ -7,11 +7,13 @@ find_program(RPMBUILD
     NAMES rpmbuild
     PATHS "/usr/bin")
 
-if ( RPMBUILD )
+mark_as_advanced(RPMBUILD)
+
+if(RPMBUILD)
     get_filename_component(RPMBUILD_PATH ${RPMBUILD} ABSOLUTE)
     message(STATUS "Found rpmbuild : ${RPMBUILD_PATH}")
     set(RPMBUILD_FOUND "YES")
-else ( RPMBUILD 
+else(RPMBUILD
     message(STATUS "rpmbuild NOT found. RPM generation will not be available")
     set(RPMBUILD_FOUND "NO")
-endif ( RPMBUILD )
+endif()
index 880664f..f0349f3 100644 (file)
@@ -59,10 +59,12 @@ static void BLI_bitmap_set(BLI_bitmap b, int index)
        b[index >> 3] |= (1 << (index & 7));
 }
 
+#if 0 /* UNUSED */
 static void BLI_bitmap_clear(BLI_bitmap b, int index)
 {
        b[index >> 3] &= ~(1 << (index & 7));
 }
+#endif
 
 /* Axis-aligned bounding box */
 typedef struct {
index e7eef76..db8f1d7 100644 (file)
@@ -2146,6 +2146,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
        
        prop= RNA_def_property(srna, "resolution_percentage", PROP_INT, PROP_PERCENTAGE);
        RNA_def_property_int_sdna(prop, NULL, "size");
+       RNA_def_property_range(prop, 1, INT_MAX);
        RNA_def_property_ui_range(prop, 1, 100, 10, 1);
        RNA_def_property_ui_text(prop, "Resolution %", "Percentage scale for render resolution");
        RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);