griefith/test2
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

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)
{
int totvert= dm->getNumVerts(dm);
/* int totvert= dm->getNumVerts(dm); */ /* UNUSED */
int totface= dm->getNumFaces(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_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;