diff options
-rw-r--r-- | build_files/cmake/cmake_qtcreator_project.py | 1 | ||||
-rw-r--r-- | doc/manpage/blender.1 | 13 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_dopesheet.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 2 | ||||
-rw-r--r-- | source/tests/bl_test.py | 4 |
7 files changed, 17 insertions, 11 deletions
diff --git a/build_files/cmake/cmake_qtcreator_project.py b/build_files/cmake/cmake_qtcreator_project.py index 601cf865ab4..617f2c2a81f 100644 --- a/build_files/cmake/cmake_qtcreator_project.py +++ b/build_files/cmake/cmake_qtcreator_project.py @@ -125,7 +125,6 @@ def cmake_advanced_info(): defines = [] - create_eclipse_project(CMAKE_DIR) from xml.dom.minidom import parse diff --git a/doc/manpage/blender.1 b/doc/manpage/blender.1 index 2c301d982e1..c27cc98f08b 100644 --- a/doc/manpage/blender.1 +++ b/doc/manpage/blender.1 @@ -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 diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index 8b54b073c40..930a2029d32 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -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="") diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 7b4c1848ff9..60286f9e360 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -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 ********** diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index c29cd627692..b021dbb4160 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -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() diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 587d1dc01a2..a8447e2a12a 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -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; diff --git a/source/tests/bl_test.py b/source/tests/bl_test.py index 5dd7dbe32d7..cfe91356444 100644 --- a/source/tests/bl_test.py +++ b/source/tests/bl_test.py @@ -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() |