[Bf-blender-cvs] [48a36ff9e99] master: Cleanup: manually apply changes missed last commit

Campbell Barton noreply at git.blender.org
Wed Feb 6 06:49:09 CET 2019


Commit: 48a36ff9e996ba25b4353cdb41a357ea070d5d41
Author: Campbell Barton
Date:   Wed Feb 6 15:52:04 2019 +1100
Branches: master
https://developer.blender.org/rB48a36ff9e996ba25b4353cdb41a357ea070d5d41

Cleanup: manually apply changes missed last commit

Automatic edits failed for indented comment blocks,
removed indentation & adjusted.

===================================================================

M	source/blender/blenkernel/BKE_gpencil.h
M	source/blender/blenkernel/intern/gpencil_modifier.c
M	source/blender/blenlib/intern/string_utf8.c
M	source/blender/collada/BlenderContext.cpp
M	source/blender/collada/BlenderContext.h
M	source/blender/depsgraph/intern/node/deg_node_factory.cc
M	source/blender/editors/gpencil/gpencil_edit.c
M	source/blender/editors/gpencil/gpencil_fill.c
M	source/blender/editors/gpencil/gpencil_merge.c
M	source/blender/editors/gpencil/gpencil_paint.c
M	source/blender/editors/gpencil/gpencil_primitive.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
M	source/blender/makesdna/DNA_documentation.h
M	source/blender/makesdna/intern/makesdna.c
M	source/blender/makesrna/RNA_documentation.h
M	source/blender/makesrna/intern/rna_gpencil.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_gpencil.h b/source/blender/blenkernel/BKE_gpencil.h
index 8c16af29558..09ab1ff39a2 100644
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@ -20,9 +20,8 @@
 #ifndef __BKE_GPENCIL_H__
 #define __BKE_GPENCIL_H__
 
- /** \file
-  *  \ingroup bke
-  */
+/** \file \ingroup bke
+ */
 
 struct ArrayGpencilModifierData;
 struct BoundBox;
diff --git a/source/blender/blenkernel/intern/gpencil_modifier.c b/source/blender/blenkernel/intern/gpencil_modifier.c
index 9e6aa359afa..7683711274c 100644
--- a/source/blender/blenkernel/intern/gpencil_modifier.c
+++ b/source/blender/blenkernel/intern/gpencil_modifier.c
@@ -17,10 +17,8 @@
  * This is a new part of Blender
  */
 
- /** \file
-  *  \ingroup bke
-  */
-
+/** \file \ingroup bke
+ */
 
 #include <stdio.h>
 
diff --git a/source/blender/blenlib/intern/string_utf8.c b/source/blender/blenlib/intern/string_utf8.c
index 9a76eccb894..03367a96696 100644
--- a/source/blender/blenlib/intern/string_utf8.c
+++ b/source/blender/blenlib/intern/string_utf8.c
@@ -19,9 +19,8 @@
  * All rights reserved.
  */
 
- /** \file
-  *  \ingroup bli
-  */
+/** \file \ingroup bli
+ */
 
 #include <string.h>
 #include <wchar.h>
diff --git a/source/blender/collada/BlenderContext.cpp b/source/blender/collada/BlenderContext.cpp
index 31be5bfd87d..602dae631fc 100644
--- a/source/blender/collada/BlenderContext.cpp
+++ b/source/blender/collada/BlenderContext.cpp
@@ -14,9 +14,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
- /** \file
-  *  \ingroup collada
-  */
+/** \file \ingroup collada
+ */
 
 #include "BlenderContext.h"
 #include "BKE_scene.h"
diff --git a/source/blender/collada/BlenderContext.h b/source/blender/collada/BlenderContext.h
index 60024b12cb3..b804d020587 100644
--- a/source/blender/collada/BlenderContext.h
+++ b/source/blender/collada/BlenderContext.h
@@ -14,9 +14,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
- /** \file
-  *  \ingroup collada
-  */
+/** \file \ingroup collada
+ */
 
 #ifndef __BLENDERCONTEXT_H__
 #define __BLENDERCONTEXT_H__
diff --git a/source/blender/depsgraph/intern/node/deg_node_factory.cc b/source/blender/depsgraph/intern/node/deg_node_factory.cc
index 2195dfd3944..4ba17db0345 100644
--- a/source/blender/depsgraph/intern/node/deg_node_factory.cc
+++ b/source/blender/depsgraph/intern/node/deg_node_factory.cc
@@ -17,8 +17,7 @@
  * All rights reserved.
  */
 
-/** \file *
- *  \ingroup depsgraph
+/** \file \ingroup depsgraph
  */
 
 #include "intern/node/deg_node_factory.h"
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index 5a4e9c38499..580480a3b46 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -18,10 +18,8 @@
  * Operators for editing Grease Pencil strokes
  */
 
- /** \file
-  *  \ingroup edgpencil
-  */
-
+/** \file \ingroup edgpencil
+ */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c
index a7070e85132..4069a6a9fcf 100644
--- a/source/blender/editors/gpencil/gpencil_fill.c
+++ b/source/blender/editors/gpencil/gpencil_fill.c
@@ -17,9 +17,8 @@
  * This is a new part of Blender
  */
 
- /** \file
-  *  \ingroup edgpencil
-  */
+/** \file \ingroup edgpencil
+ */
 
 #include <stdio.h>
 
diff --git a/source/blender/editors/gpencil/gpencil_merge.c b/source/blender/editors/gpencil/gpencil_merge.c
index d2e2177257c..0dc3c18adb9 100644
--- a/source/blender/editors/gpencil/gpencil_merge.c
+++ b/source/blender/editors/gpencil/gpencil_merge.c
@@ -18,10 +18,8 @@
  * Operators for merge Grease Pencil strokes
  */
 
- /** \file
-  *  \ingroup edgpencil
-  */
-
+/** \file \ingroup edgpencil
+ */
 
 #include <stdio.h>
 
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 101f0e9ff62..c3acd01969e 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -17,10 +17,8 @@
  * This is a new part of Blender
  */
 
- /** \file
-  *  \ingroup edgpencil
-  */
-
+/** \file \ingroup edgpencil
+ */
 
 #include <stdio.h>
 #include <stddef.h>
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index e0c25ce4b1d..d7d056319ed 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -18,10 +18,8 @@
  * Operators for creating new Grease Pencil primitives (boxes, circles, ...)
  */
 
- /** \file
-  *  \ingroup edgpencil
-  */
-
+/** \file \ingroup edgpencil
+ */
 
 #include <stdio.h>
 #include <string.h>
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
index d3f9b598e00..e3516cd1ae1 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
@@ -17,9 +17,8 @@
  * This is a new part of Blender
  */
 
- /** \file
-  *  \ingroup modifiers
-  */
+/** \file \ingroup modifiers
+ */
 
 #include <stdio.h>
 
diff --git a/source/blender/makesdna/DNA_documentation.h b/source/blender/makesdna/DNA_documentation.h
index a3306d2f6c2..d75e864e5f8 100644
--- a/source/blender/makesdna/DNA_documentation.h
+++ b/source/blender/makesdna/DNA_documentation.h
@@ -17,9 +17,8 @@
  * All rights reserved.
  */
 
-/**
+/** \file \ingroup DNA
  *  \page makesdna makesdna
- *  \ingroup DNA
  *
  * \section aboutdna About the DNA module
  *
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index c1962e030dc..ac413878ea2 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -17,9 +17,9 @@
  * All rights reserved.
  */
 
-/**  \file
- *   \brief Struct muncher for making SDNA.
- *   \ingroup DNA
+/** \file \ingroup DNA
+ *
+ * \brief Struct muncher for making SDNA.
  *
  * \section aboutmakesdnac About makesdna tool
  * Originally by Ton, some mods by Frank, and some cleaning and
diff --git a/source/blender/makesrna/RNA_documentation.h b/source/blender/makesrna/RNA_documentation.h
index 1608fffc3fa..8402f6174e8 100644
--- a/source/blender/makesrna/RNA_documentation.h
+++ b/source/blender/makesrna/RNA_documentation.h
@@ -1,5 +1,5 @@
-/** \file \page makesrna makesrna
- *  \ingroup RNA
+/** \file \ingroup RNA
+ *  \page makesrna makesrna
  *  \section aboutmakesrna About RNA
  *  The \ref RNA module defines and provides the access API to the data, thus encapsulating \ref DNA
  */
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 4c620980f7d..92a2e333a36 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -14,9 +14,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
- /** \file
-  *  \ingroup RNA
-  */
+/** \file \ingroup RNA
+ */
 
 #include <stdlib.h>



More information about the Bf-blender-cvs mailing list