[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42546] trunk/blender: picky edits & regen man page

[Campbell Barton]

Revision: 42546
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42546
Author:   campbellbarton
Date:     2011-12-10 01:07:22 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
picky edits & regen man page

Modified Paths:
--------------
    trunk/blender/doc/manpage/blender.1
    trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
    trunk/blender/source/blender/gpu/intern/gpu_draw.c

Modified: trunk/blender/doc/manpage/blender.1
===================================================================
(Binary files differ)

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-12-10 01:01:22 UTC (rev 42545)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2011-12-10 01:07:22 UTC (rev 42546)
@@ -1834,7 +1834,7 @@
 
 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);

Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_draw.c	2011-12-10 01:01:22 UTC (rev 42545)
+++ trunk/blender/source/blender/gpu/intern/gpu_draw.c	2011-12-10 01:07:22 UTC (rev 42546)
@@ -1162,7 +1162,7 @@
 			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;