diff options
| -rw-r--r-- | doc/manpage/blender.1 | 7 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/doc/manpage/blender.1 b/doc/manpage/blender.1 index 620a90e61d2..169006fc609 100644 --- a/doc/manpage/blender.1 +++ b/doc/manpage/blender.1 @@ -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 diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index c829d840ace..06f29b95825 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -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); diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c index 2d2da3c592d..d63be22bc13 100644 --- a/source/blender/gpu/intern/gpu_draw.c +++ b/source/blender/gpu/intern/gpu_draw.c @@ -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; |