diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2020-05-12 18:54:20 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2020-05-12 18:54:20 +0300 |
| commit | 33f9fe3c620fef1d1ad2cb3443bf503afdb9db3b (patch) | |
| tree | a841b5f04d635d0af308f6bfce94c69ca6a2e6c1 /source/blender/blenkernel/BKE_paint.h | |
| parent | 25c67a65d686aa04570db7409618ad779318c17a (diff) | |
| parent | f24e9bb0380936bcaf6c194b54342a2977784cff (diff) | |
Merge branch 'blender-v2.83-release'
Conflicts:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/BKE_blender_version.h
Diffstat (limited to 'source/blender/blenkernel/BKE_paint.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_paint.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index c4c4314acea..a7ece2e3167 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -402,7 +402,7 @@ typedef struct SculptSession { /* TODO: identify sculpt-only fields */ // struct { ... } sculpt; } mode; - int mode_type; + eObjectMode mode_type; /* This flag prevents PBVH from being freed when creating the vp_handle for texture paint. */ bool building_vp_handle; |