picky edits & regen man page
authorCampbell Barton <ideasman42@gmail.com>
Sat, 10 Dec 2011 01:07:22 +0000 (01:07 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 10 Dec 2011 01:07:22 +0000 (01:07 +0000)
doc/manpage/blender.1
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/gpu/intern/gpu_draw.c

index 620a90e61d209f5710196abee0a63795312b53ff..169006fc6095ca28e7042079c9f766d5ddcd8308 100644 (file)
@@ -1,4 +1,4 @@
-.TH "BLENDER" "1" "October 17, 2011" "Blender Blender 2\&.60 (sub 0)"
+.TH "BLENDER" "1" "December 10, 2011" "Blender Blender 2\&.60 (sub 7)"
 
 .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.59 (sub 4)
+Blender 2.60 (sub 7)
 Usage: blender [args ...] [file] [args ...]
 .br
 .SS "Render Options:"
@@ -378,11 +378,10 @@ Arguments are executed in the order they are given. eg
   \fIBLENDER_USER_CONFIG\fR Directory for user 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, ..).
+  \fIBLENDER_USER_DAT`AFILES\fR Directory for user data files (icons, translations, ..).
   \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 c829d840ace121eb7c393f38a9777fef0fc8cd6c..06f29b95825b550c51dc47c81cf14890ea239ac2 100644 (file)
@@ -1834,7 +1834,7 @@ void DM_add_tangent_layer(DerivedMesh *dm)
 
 void DM_calc_auto_bump_scale(DerivedMesh *dm)
 {
-       int totvert= dm->getNumVerts(dm);
+       /* int totvert= dm->getNumVerts(dm); */ /* UNUSED */
        int totface= dm->getNumFaces(dm);
 
        MVert * mvert = dm->getVertArray(dm);
index 2d2da3c592d5938a2cc3126b933598f01ca4863c..d63be22bc1309f55c8d7eb78df35c5ce394c4c89 100644 (file)
@@ -1162,7 +1162,7 @@ int GPU_enable_material(int nr, void *attribs)
                        GPU_material_vertex_attributes(gpumat, gattribs);
                        GPU_material_bind(gpumat, GMS.gob->lay, GMS.glay, 1.0, !(GMS.gob->mode & OB_MODE_TEXTURE_PAINT));
 
-                       auto_bump_scale = GMS.gob->derivedFinal!=0 ? GMS.gob->derivedFinal->auto_bump_scale : 1.0f;
+                       auto_bump_scale = GMS.gob->derivedFinal != NULL GMS.gob->derivedFinal->auto_bump_scale : 1.0f;
                        GPU_material_bind_uniforms(gpumat, GMS.gob->obmat, GMS.gviewmat, GMS.gviewinv, GMS.gob->col, auto_bump_scale);
                        GMS.gboundmat= mat;