diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-10 09:38:00 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-10 09:38:00 +0400 |
| commit | 65f3b93f144699fa4aafa46c7e226aa1390b7239 (patch) | |
| tree | 1a9599589c98d9e17631844fd011463031fe59cd /source/blender/blenkernel/BKE_DerivedMesh.h | |
| parent | 99d893bb89a96dd0d6cb9410b12928e7ade4b565 (diff) | |
| parent | a88b29c062f32514e4414bfd4006f7b348077a42 (diff) | |
svn merge ^/trunk/blender -r42521:42550
Diffstat (limited to 'source/blender/blenkernel/BKE_DerivedMesh.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_DerivedMesh.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index 98a5154c256..139119ee873 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -128,6 +128,7 @@ struct DerivedMesh { BVHCache bvhCache; struct GPUDrawObject *drawObject; DerivedMeshType type; + float auto_bump_scale; /* calculate vert and face normals */ void (*calcNormals)(DerivedMesh *dm); @@ -655,6 +656,7 @@ void DM_vertex_attributes_from_gpu(DerivedMesh *dm, struct GPUVertexAttribs *gattribs, DMVertexAttribs *attribs); void DM_add_tangent_layer(DerivedMesh *dm); +void DM_calc_auto_bump_scale(DerivedMesh *dm); /* Set object's bounding box based on DerivedMesh min/max data */ void DM_set_object_boundbox(struct Object *ob, DerivedMesh *dm); |