Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@stuvel.eu>2018-04-08 15:07:34 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2018-04-08 15:07:34 +0300
commita981206fd183355bdcc8331b3a74ce3d382e1f67 (patch)
treeefa5534ed691645530707a80cf4a2039909f79b7 /source/blender/editors/lattice
parent0b5ebb3265b155658d441135e152f32ba11c001d (diff)
parent245e01c30ac296c509e04f702c6b5d76086265b5 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/lattice')
-rw-r--r--source/blender/editors/lattice/lattice_intern.h2
-rw-r--r--source/blender/editors/lattice/lattice_ops.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/lattice/lattice_intern.h b/source/blender/editors/lattice/lattice_intern.h
index 94f528a0457..7902b992270 100644
--- a/source/blender/editors/lattice/lattice_intern.h
+++ b/source/blender/editors/lattice/lattice_intern.h
@@ -21,7 +21,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/editors/metaball/lattice_intern.h
+/** \file blender/editors/lattice/lattice_intern.h
* \ingroup edlattice
*/
diff --git a/source/blender/editors/lattice/lattice_ops.c b/source/blender/editors/lattice/lattice_ops.c
index 37a10cbe12a..d3d57a0b510 100644
--- a/source/blender/editors/lattice/lattice_ops.c
+++ b/source/blender/editors/lattice/lattice_ops.c
@@ -24,7 +24,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/editors/metaball/lattice_ops.c
+/** \file blender/editors/lattice/lattice_ops.c
* \ingroup edlattice
*/