quiet 2 compiler warnings and update man page

diff --git a/doc/manpage/blender.1 b/doc/manpage/blender.1
index c27cc98f08bdeec4df21710a475fe00907b8cf2a..ddf3a79b104cd23a968ec493b3706f464a2b2c88 100644 (file)
--- a/doc/manpage/blender.1
+++ b/doc/manpage/blender.1
@@ -1,4 +1,4 @@
-.TH "BLENDER" "1" "April 05, 2011" "Blender Blender 2\&.56 (sub 6)"
+.TH "BLENDER" "1" "June 03, 2011" "Blender Blender 2\&.57 (sub 1)"
 
 .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 6)
+Blender 2.57 (sub 1)
 Usage: blender [args ...] [file] [args ...]
 .br
 .SS "Render Options:"
@@ -160,6 +160,12 @@ Force opening without borders
 Open with lower left corner at <sx>, <sy> and width and height as <w>, <h>
 .br
 
+.TP
+.B \-con or \-\-start\-console
+.br
+Start with the console window open (ignored if \-b is set)
+.br
+
 .IP
 
 .SS "Game Engine Specific Options:"
@@ -191,7 +197,7 @@ Turn debugging on
 .br
 * Disables mouse grab (to interact with a debugger in some cases)
 .br
-* Keeps python sys.stdin rather then setting it to None
+* Keeps python sys.stdin rather than setting it to None
 .br
 
 .TP
@@ -210,12 +216,6 @@ Skip reading the "startup.blend" in the users home directory
 
 .IP
 
-.TP
-.B \-\-env\-system\-config
-.br
-Set the BLENDER_SYSTEM_CONFIG environment variable
-.br
-
 .TP
 .B \-\-env\-system\-datafiles
 .br
@@ -281,7 +281,7 @@ Print this help text and exit
 .TP
 .B \-y or \-\-enable\-autoexec
 .br
-Enable automatic python script execution (default)
+Enable automatic python script execution, (default)
 .br
 
 .TP
@@ -376,7 +376,6 @@ Arguments are executed in the order they are given. eg
 .br
 .SH "ENVIRONMENT VARIABLES"
   \fIBLENDER_USER_CONFIG\fR Directory for user configuration files.
-  \fIBLENDER_SYSTEM_CONFIG\fR Directory for system wide configuration files.
   \fIBLENDER_USER_SCRIPTS\fR Directory for user scripts.
   \fIBLENDER_SYSTEM_SCRIPTS\fR Directory for system wide scripts.
   \fIBLENDER_USER_DATAFILES\fR Directory for user data files (icons, translations, ..).

diff --git a/source/blender/imbuf/intern/targa.c b/source/blender/imbuf/intern/targa.c
index 5d9f350be486c7b97f681865f54cd37e8ee58891..ec00b15c07920e1874cfdb72ff76e5c327a6e6dc 100644 (file)
--- a/source/blender/imbuf/intern/targa.c
+++ b/source/blender/imbuf/intern/targa.c
@@ -586,7 +586,7 @@ struct ImBuf *imb_loadtarga(unsigned char *mem, size_t mem_size, int flags)
                ibuf->depth = size;
 
                if (tga.mapbits != 32) {        /* set alpha bits  */
-                       cmap[0] &= BIG_LONG(0x00ffffff);
+                       cmap[0] &= BIG_LONG(0x00ffffffl);
                }
        }
        

diff --git a/source/blender/modifiers/intern/MOD_none.c b/source/blender/modifiers/intern/MOD_none.c
index 489733c8480080c0c8dedfdccb824159886c807f..48c5b9a4c084bd86e62743893ad6d404e168687b 100644 (file)
--- a/source/blender/modifiers/intern/MOD_none.c
+++ b/source/blender/modifiers/intern/MOD_none.c
@@ -57,7 +57,7 @@ ModifierTypeInfo modifierType_None = {
        /* name */              "None",
        /* structName */        "ModifierData",
        /* structSize */        sizeof(ModifierData),
-       /* type */              eModifierType_None,
+       /* type */              eModifierTypeType_None,
        /* flags */             eModifierTypeFlag_AcceptsMesh
                                                        | eModifierTypeFlag_AcceptsCVs,