diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-03 10:59:06 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-03 10:59:06 +0300 |
| commit | 2bfa061a15762e93f0391e3348f58bcfa512d8fc (patch) | |
| tree | b3d51e85572e3272c1e0a4c1817d011f61f81386 /source/blender/editors/sculpt_paint/paint_vertex_color_utils.c | |
| parent | 21369429168c5799125a63ef728947f4fd6668e9 (diff) | |
| parent | 2b3ff61d805ccbb219e773e1a5c69e02b0c90109 (diff) | |
Merge branch 'master' into blender2.8
Notes:
- Changes in paint_vertex.c were simple to merge, mainly related on passing
evaluation context.
- Conflicts in EditDM and drawmesh.c are solved using code from blender2.8
branch. Those areas are deprecated and not to be used in final release.
However, it's possible that some reference code from master is lost, so
keep attention when adding alpha support for vertex painting.
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_vertex_color_utils.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex_color_utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c b/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c index a3da5a76dec..3b3e7297aec 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c @@ -281,7 +281,7 @@ BLI_INLINE uint mcol_darken(uint col1, uint col2, int fac) BLI_INLINE uint mcol_colordodge(uint col1, uint col2, int fac) { uchar *cp1, *cp2, *cp; - int mfac,temp; + int mfac, temp; uint col = 0; if (fac == 0) { |