diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-26 20:29:14 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-26 20:29:14 +0400 |
commit | 3b5bcab09c28163f16d653a5b76dd3192c911007 (patch) | |
tree | 8127e7a5ce98641f27d0edd035922f3ddc9de1a3 /source/blender/blenkernel/BKE_DerivedMesh.h | |
parent | f1996b5601e41602157035b1d91e8386761bd839 (diff) | |
parent | d52a811052c67686845dd1737d42fe65add51d55 (diff) |
svn merge ^/trunk/blender -r42139:42172
Diffstat (limited to 'source/blender/blenkernel/BKE_DerivedMesh.h')
-rw-r--r-- | source/blender/blenkernel/BKE_DerivedMesh.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index 819d6de70e9..ad9c65c4523 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -612,7 +612,7 @@ int editbmesh_get_first_deform_matrices(struct Scene *, struct Object *, struct int sculpt_get_deform_matrices(struct Scene *scene, struct Object *ob, float (**deformmats)[3][3], float (**deformcos)[3]); -void weight_to_rgb(float input, float *fr, float *fg, float *fb); +void weight_to_rgb(float r_rgb[3], const float weight); /* convert layers requested by a GLSL material to actually available layers in * the DerivedMesh, with both a pointer for arrays and an offset for editmesh */ |