fix [#26152] Blender File for Image too Small

disallow 0% rendersize.

also mark new cmake vars as advanced: RPMBUILD, X11_XF86keysym_INCLUDE_PATH
This commit is contained in:
Campbell Barton
2011-02-21 01:02:30 +00:00
parent 958b5c1d8d
commit 7809d7d0c8
4 changed files with 9 additions and 3 deletions

View 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}")

View 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()

View 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 {

View 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);