diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-18 06:11:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-18 06:11:38 +0300 |
| commit | e8452cf0bccea0b06a24b370e9ed2331abec3a3c (patch) | |
| tree | 096305a009bb44c0c68fe07e9cb98f28fe60c4b9 /source/blender/editors/sculpt_paint | |
| parent | 27dff3fbc1e74aa6613d68a0d9f9b0096fc86f6e (diff) | |
| parent | 6880a549ba4bb4150c17df196a1d6d24e66d8486 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/sculpt_paint')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index 57a3044cc2b..1ec1e052d43 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -282,7 +282,7 @@ static void imapaint_pick_uv(EvaluationContext *eval_ctx, Scene *scene, Object * float p[2], w[3], absw, minabsw; float matrix[4][4], proj[4][4]; GLint view[4]; - const eImageePaintMode mode = scene->toolsettings->imapaint.mode; + const eImagePaintMode mode = scene->toolsettings->imapaint.mode; const MLoopTri *lt = dm->getLoopTriArray(dm); const MPoly *mpoly = dm->getPolyArray(dm); const MLoop *mloop = dm->getLoopArray(dm); |