Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

quiet warning & minor pep8 edits.

Browse Source
This commit is contained in:
Campbell Barton
2011-04-04 22:42:43 +00:00
parent b3bc0040d8
commit 162d02bf50
7 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build_files/cmake/cmake_qtcreator_project.py
View File

@@ -125,7 +125,6 @@ def cmake_advanced_info():
defines = [] defines = []
create_eclipse_project(CMAKE_DIR) create_eclipse_project(CMAKE_DIR)
from xml.dom.minidom import parse from xml.dom.minidom import parse

13
doc/manpage/blender.1
View 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 .SH NAME
blender \- a 3D modelling and rendering package 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 http://www.blender.org
.SH OPTIONS .SH OPTIONS
Blender 2.56 (sub 0) Build Blender 2.56 (sub 6)
Usage: blender [args ...] [file] [args ...] Usage: blender [args ...] [file] [args ...]
.br .br
.SS "Render Options:" .SS "Render Options:"
@@ -347,7 +347,13 @@ Playback <file(s)>, only operates this way when not running in background.
.TP .TP
.B \-R .B \-R
.br .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 .br
.SS "Argument Parsing:" .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_DATAFILES\fR Directory for system wide data files.
\fIBLENDER_SYSTEM_PYTHON\fR Directory for system python libraries. \fIBLENDER_SYSTEM_PYTHON\fR Directory for system python libraries.
\fITMP\fR or \fITMPDIR\fR Store temporary files here. \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. \fIPYTHONHOME\fR Path to the python directory, eg. /usr/lib/python.
.br .br
.br .br

2
source/blender/blenkernel/intern/pointcache.c
View File

@@ -1028,7 +1028,6 @@ static int ptcache_file_compressed_read(PTCacheFile *pf, unsigned char *result,
size_t in_len; size_t in_len;
#ifdef WITH_LZO #ifdef WITH_LZO
size_t out_len = len; size_t out_len = len;
size_t sizeOfIt = 5;
#endif #endif
unsigned char *in; unsigned char *in;
unsigned char *props = MEM_callocN(16*sizeof(char), "tmp"); 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 #ifdef WITH_LZMA
if(compressed == 2) if(compressed == 2)
{ {
size_t sizeOfIt;
size_t leni = in_len, leno = out_len; size_t leni = in_len, leno = out_len;
ptcache_file_read(pf, &size, 1, sizeof(unsigned int)); ptcache_file_read(pf, &size, 1, sizeof(unsigned int));
sizeOfIt = (size_t)size; sizeOfIt = (size_t)size;

4
source/tests/bl_test.py
View File

@@ -170,7 +170,9 @@ def main():
md5_update = md5_instance.update md5_update = md5_instance.update
for f in md5_source: 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() md5_new = md5_instance.hexdigest()