[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35007] trunk/blender: fix [#26152] Blender File for Image too Small
Campbell Barton
ideasman42 at gmail.com
Mon Feb 21 02:02:30 CET 2011
Revision: 35007
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35007
Author: campbellbarton
Date: 2011-02-21 01:02:30 +0000 (Mon, 21 Feb 2011)
Log Message:
-----------
fix [#26152] Blender File for Image too Small
disallow 0% rendersize.
also mark new cmake vars as advanced: RPMBUILD, X11_XF86keysym_INCLUDE_PATH
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/build_files/cmake/RpmBuild.cmake
trunk/blender/source/blender/blenlib/intern/pbvh.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-02-21 00:45:54 UTC (rev 35006)
+++ trunk/blender/CMakeLists.txt 2011-02-21 01:02:30 UTC (rev 35007)
@@ -340,6 +340,7 @@
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}")
Modified: trunk/blender/build_files/cmake/RpmBuild.cmake
===================================================================
--- trunk/blender/build_files/cmake/RpmBuild.cmake 2011-02-21 00:45:54 UTC (rev 35006)
+++ trunk/blender/build_files/cmake/RpmBuild.cmake 2011-02-21 01:02:30 UTC (rev 35007)
@@ -7,11 +7,13 @@
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()
Modified: trunk/blender/source/blender/blenlib/intern/pbvh.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/pbvh.c 2011-02-21 00:45:54 UTC (rev 35006)
+++ trunk/blender/source/blender/blenlib/intern/pbvh.c 2011-02-21 01:02:30 UTC (rev 35007)
@@ -59,10 +59,12 @@
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 {
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2011-02-21 00:45:54 UTC (rev 35006)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2011-02-21 01:02:30 UTC (rev 35007)
@@ -2146,6 +2146,7 @@
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);
More information about the Bf-blender-cvs
mailing list