Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

picky edits & regen man page

Browse Source
This commit is contained in:
Campbell Barton
2011-12-10 01:07:22 +00:00
parent 87ff925d90
commit ae17390b77
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
doc/manpage/blender.1
View 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 .SH NAME
blender \- a 3D modelling and rendering package 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 http://www.blender.org
.SH OPTIONS .SH OPTIONS
Blender 2.59 (sub 4) Blender 2.60 (sub 7)
Usage: blender [args ...] [file] [args ...] Usage: blender [args ...] [file] [args ...]
.br .br
.SS "Render Options:" .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_CONFIG\fR Directory for user configuration files.
\fIBLENDER_USER_SCRIPTS\fR Directory for user scripts. \fIBLENDER_USER_SCRIPTS\fR Directory for user scripts.
\fIBLENDER_SYSTEM_SCRIPTS\fR Directory for system wide 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_DATAFILES\fR Directory for system wide data files.
\fIBLENDER_SYSTEM_PYTHON\fR Directory for system python libraries. \fIBLENDER_SYSTEM_PYTHON\fR Directory for system python libraries.
\fITMP\fR or \fITMPDIR\fR Store temporary files here. \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. \fIPYTHONHOME\fR Path to the python directory, eg. /usr/lib/python.
.br .br
.br .br

2
source/blender/blenkernel/intern/DerivedMesh.c
View File

@@ -1834,7 +1834,7 @@ void DM_add_tangent_layer(DerivedMesh *dm)
void DM_calc_auto_bump_scale(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); int totface= dm->getNumFaces(dm);
MVert * mvert = dm->getVertArray(dm); MVert * mvert = dm->getVertArray(dm);

2
source/blender/gpu/intern/gpu_draw.c
View File

@@ -1162,7 +1162,7 @@ int GPU_enable_material(int nr, void *attribs)
GPU_material_vertex_attributes(gpumat, gattribs); GPU_material_vertex_attributes(gpumat, gattribs);
GPU_material_bind(gpumat, GMS.gob->lay, GMS.glay, 1.0, !(GMS.gob->mode & OB_MODE_TEXTURE_PAINT)); 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); GPU_material_bind_uniforms(gpumat, GMS.gob->obmat, GMS.gviewmat, GMS.gviewinv, GMS.gob->col, auto_bump_scale);
GMS.gboundmat= mat; GMS.gboundmat= mat;