diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2022-09-22 12:52:48 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2022-09-22 12:54:53 +0300 |
| commit | 2db84a8ee7cd3873e11eb0c13abc09869caa0042 (patch) | |
| tree | ea15209cc9742e23f36a7e692eb837723bfa64b3 /source/blender/bmesh/bmesh.h | |
| parent | a41ee7ea1ae9bb1bcc537576d9ffdb3bca3201f3 (diff) | |
Fix all merge conflicts
There was a lot of conflicts and to solve, I refresh manually the source folders.
Diffstat (limited to 'source/blender/bmesh/bmesh.h')
| -rw-r--r-- | source/blender/bmesh/bmesh.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/bmesh/bmesh.h b/source/blender/bmesh/bmesh.h index 2833105e5a4..3956db0288a 100644 --- a/source/blender/bmesh/bmesh.h +++ b/source/blender/bmesh/bmesh.h @@ -148,7 +148,7 @@ * * These conventions should be used throughout the bmesh module. * - * - `bmesh_kernel_*()` - Low level API, for primitive functions that others are built ontop of. + * - `bmesh_kernel_*()` - Low level API, for primitive functions that others are built on top of. * - `bmesh_***()` - Low level API function. * - `bm_***()` - 'static' functions, not a part of the API at all, * but use prefix since they operate on BMesh data. |