diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-07-01 03:08:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-07-01 03:25:49 +0300 |
| commit | 924596abade329d2b391edd53debc91bc6c5626d (patch) | |
| tree | 76c2fed26916b94b96d9d0ae503569e9dfe5c86a | |
| parent | c1fc18086118012637bdc5a32c5ced1742d69dac (diff) | |
Cleanup: clang-format, clang-tidy
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.cc | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_260.c | 2 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc index 52b5ea0a573..7063c670ee4 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.cc +++ b/source/blender/blenkernel/intern/DerivedMesh.cc @@ -1937,7 +1937,7 @@ static void mesh_build_data(struct Depsgraph *depsgraph, mesh_calc_modifiers(depsgraph, scene, ob, - 1, + true, need_mapping, dataMask, -1, diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c index 1b8615f7893..070dd181509 100644 --- a/source/blender/blenloader/intern/versioning_260.c +++ b/source/blender/blenloader/intern/versioning_260.c @@ -2412,7 +2412,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain) /* 'Increment' mode disabled for nodes, use true grid snapping instead */ if (scene->toolsettings->snap_node_mode == 0) { /* SCE_SNAP_MODE_INCREMENT */ - scene->toolsettings->snap_node_mode = 8; /* SCE_SNAP_MODE_GRID */ + scene->toolsettings->snap_node_mode = 8; /* SCE_SNAP_MODE_GRID */ } #ifdef WITH_FFMPEG diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index ecd6ef78ff8..399761ead8d 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -2459,7 +2459,8 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) scene->toolsettings->snap_node_mode = (1 << 6); /* SCE_SNAP_MODE_NODE_Y */ break; case 7: - scene->toolsettings->snap_node_mode = (1 << 5) | (1 << 6); /* SCE_SNAP_MODE_NODE_X | SCE_SNAP_MODE_NODE_Y */ + scene->toolsettings->snap_node_mode = + (1 << 5) | (1 << 6); /* SCE_SNAP_MODE_NODE_X | SCE_SNAP_MODE_NODE_Y */ break; case 8: scene->toolsettings->snap_node_mode = (1 << 7); /* SCE_SNAP_MODE_GRID */ |