diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-10 05:07:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-10 05:07:22 +0400 |
| commit | ae17390b77bfda18d387da32d1158530c19c1fa5 (patch) | |
| tree | 702f76f0ffb6953dfdd361429bc66dd91e277f90 /source | |
| parent | 87ff925d909f75d2eb63ced6610c81f0b59c1fef (diff) | |
picky edits & regen man page
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_draw.c | 2 |
2 files changed, 2 insertions, 2 deletions
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; |