quiet warning & minor pep8 edits.
authorCampbell Barton <ideasman42@gmail.com>
Mon, 4 Apr 2011 22:42:43 +0000 (22:42 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 4 Apr 2011 22:42:43 +0000 (22:42 +0000)
build_files/cmake/cmake_qtcreator_project.py
doc/manpage/blender.1
release/scripts/startup/bl_ui/space_dopesheet.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/blenkernel/intern/pointcache.c
source/tests/bl_test.py

index 601cf86..617f2c2 100644 (file)
@@ -125,7 +125,6 @@ def cmake_advanced_info():
     defines = []
 
 
-
     create_eclipse_project(CMAKE_DIR)
 
     from xml.dom.minidom import parse
index 2c301d9..c27cc98 100644 (file)
@@ -1,4 +1,4 @@
-.TH "BLENDER" "1" "January 27, 2011" "Blender Blender 2\&.56 (sub 0) "
+.TH "BLENDER" "1" "April 05, 2011" "Blender Blender 2\&.56 (sub 6)"
 
 .SH NAME
 blender \- a 3D modelling and rendering package
@@ -15,7 +15,7 @@ Use Blender to create TV commercials, to make technical visualizations, business
 http://www.blender.org
 .SH OPTIONS
 
-Blender 2.56 (sub 0) Build
+Blender 2.56 (sub 6)
 Usage: blender [args ...] [file] [args ...]
 .br
 .SS "Render Options:"
@@ -347,7 +347,13 @@ Playback <file(s)>, only operates this way when not running in background.
 .TP
 .B \-R
 .br
-Register .blend extension (windows only)
+Register .blend extension, then exit (Windows only)
+.br
+
+.TP
+.B \-r
+.br
+Silently register .blend extension, then exit (Windows only)
 .br
 
 .SS "Argument Parsing:"
@@ -377,7 +383,6 @@ Arguments are executed in the order they are given. eg
   \fIBLENDER_SYSTEM_DATAFILES\fR Directory for system wide data files.
   \fIBLENDER_SYSTEM_PYTHON\fR Directory for system python libraries.
   \fITMP\fR or \fITMPDIR\fR Store temporary files here.
-  \fISDL_AUDIODRIVER\fR LibSDL audio driver \- alsa, esd, dma.
   \fIPYTHONHOME\fR Path to the python directory, eg. /usr/lib/python.
 .br
 .br
index 8b54b07..930a202 100644 (file)
@@ -73,7 +73,7 @@ def dopesheet_filter(layout, context, genericFiltersOnly=False):
             row.prop(dopesheet, "show_only_group_objects", text="")
             if dopesheet.show_only_group_objects:
                 row.prop(dopesheet, "filter_group", text="")
-   
+
     if not is_nla:
         row = layout.row(align=True)
         row.prop(dopesheet, "show_only_matching_fcurves", text="")
index 7b4c184..60286f9 100644 (file)
@@ -1052,9 +1052,9 @@ class VIEW3D_MT_paint_weight(bpy.types.Menu):
         layout.operator("object.vertex_group_invert", text="Invert")
         layout.operator("object.vertex_group_clean", text="Clean")
         layout.operator("object.vertex_group_levels", text="Levels")
-        
+
         layout.separator()
-        
+
         layout.operator("paint.weight_set")
 
 # ********** Sculpt menu **********
index c29cd62..b021dbb 100644 (file)
@@ -1202,7 +1202,7 @@ class VIEW3D_PT_imagepaint_options(PaintPanel):
 
     def draw(self, context):
         layout = self.layout
-        
+
         tool_settings = context.tool_settings
 
         col = layout.column()
index 587d1dc..a8447e2 100644 (file)
@@ -1028,7 +1028,6 @@ static int ptcache_file_compressed_read(PTCacheFile *pf, unsigned char *result,
        size_t in_len;
 #ifdef WITH_LZO
        size_t out_len = len;
-       size_t sizeOfIt = 5;
 #endif
        unsigned char *in;
        unsigned char *props = MEM_callocN(16*sizeof(char), "tmp");
@@ -1051,6 +1050,7 @@ static int ptcache_file_compressed_read(PTCacheFile *pf, unsigned char *result,
 #ifdef WITH_LZMA
                        if(compressed == 2)
                        {
+                               size_t sizeOfIt;
                                size_t leni = in_len, leno = out_len;
                                ptcache_file_read(pf, &size, 1, sizeof(unsigned int));
                                sizeOfIt = (size_t)size;
index 5dd7dbe..cfe9135 100644 (file)
@@ -170,7 +170,9 @@ def main():
         md5_update = md5_instance.update
 
         for f in md5_source:
-            md5_update(open(f, "rb").read())
+            filehandle = open(f, "rb")
+            md5_update(filehandle.read())
+            filehandle.close()
 
         md5_new = md5_instance.hexdigest()