diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-02-21 04:02:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-21 04:02:30 +0300 |
| commit | 7809d7d0c8cde22ec39e0b00e20742393a18c019 (patch) | |
| tree | 67a6b09d144b663ea1227d6ff7f7956fe1cdd1f5 | |
| parent | 958b5c1d8da55bba52317bb0143b159629548829 (diff) | |
fix [#26152] Blender File for Image too Small
disallow 0% rendersize.
also mark new cmake vars as advanced: RPMBUILD, X11_XF86keysym_INCLUDE_PATH
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | build_files/cmake/RpmBuild.cmake | 8 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/pbvh.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 1 |
4 files changed, 9 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3952e48c802..e4796187a2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}") diff --git a/build_files/cmake/RpmBuild.cmake b/build_files/cmake/RpmBuild.cmake index 90f69d9b334..2c821a9dd7a 100644 --- a/build_files/cmake/RpmBuild.cmake +++ b/build_files/cmake/RpmBuild.cmake @@ -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() diff --git a/source/blender/blenlib/intern/pbvh.c b/source/blender/blenlib/intern/pbvh.c index 880664fd55d..f0349f3be31 100644 --- a/source/blender/blenlib/intern/pbvh.c +++ b/source/blender/blenlib/intern/pbvh.c @@ -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 { diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index e7eef76cb11..db8f1d7d527 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -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); |