[Bf-blender-cvs] [14b2c41216e] master: Cleanup: doxy sections
Campbell Barton
noreply at git.blender.org
Fri Aug 2 04:31:23 CEST 2019
Commit: 14b2c41216e86a95572aa0c607fd8807da59baea
Author: Campbell Barton
Date: Fri Aug 2 12:25:39 2019 +1000
Branches: master
https://developer.blender.org/rB14b2c41216e86a95572aa0c607fd8807da59baea
Cleanup: doxy sections
===================================================================
M source/blender/editors/armature/armature_relations.c
M source/blender/python/gpu/gpu_py_shader.c
M source/blender/python/gpu/gpu_py_types.c
M source/blender/render/intern/source/render_texture.c
M source/blender/windowmanager/intern/wm_files.c
M source/creator/creator_args.c
===================================================================
diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c
index 8722e575d15..b3588404cf2 100644
--- a/source/blender/editors/armature/armature_relations.c
+++ b/source/blender/editors/armature/armature_relations.c
@@ -64,8 +64,11 @@
#include "armature_intern.h"
-/* *************************************** Join *************************************** */
-/* NOTE: no operator define here as this is exported to the Object-level operator */
+/* -------------------------------------------------------------------- */
+/** \name Edit Armature Join
+ *
+ * \note No operator define here as this is exported to the Object-level operator.
+ * \{ */
static void joined_armature_fix_links_constraints(Main *bmain,
Object *ob,
@@ -434,7 +437,11 @@ int join_armature_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
-/* *********************************** Separate *********************************************** */
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Edit Armature Separate
+ * \{ */
/* Helper function for armature separating - link fixing */
static void separated_armature_fix_links(Main *bmain, Object *origArm, Object *newArm)
@@ -712,7 +719,11 @@ void ARMATURE_OT_separate(wmOperatorType *ot)
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
}
-/* ********************************* Parenting ************************************************* */
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Edit Armature Parenting
+ * \{ */
/* armature parenting options */
#define ARM_PAR_CONNECT 1
@@ -1007,3 +1018,5 @@ void ARMATURE_OT_parent_clear(wmOperatorType *ot)
"ClearType",
"What way to clear parenting");
}
+
+/** \} */
diff --git a/source/blender/python/gpu/gpu_py_shader.c b/source/blender/python/gpu/gpu_py_shader.c
index 5d6989af4c3..cccf75513f9 100644
--- a/source/blender/python/gpu/gpu_py_shader.c
+++ b/source/blender/python/gpu/gpu_py_shader.c
@@ -37,7 +37,6 @@
#include "gpu_py_vertex_format.h"
/* -------------------------------------------------------------------- */
-
/** \name Enum Conversion.
* \{ */
diff --git a/source/blender/python/gpu/gpu_py_types.c b/source/blender/python/gpu/gpu_py_types.c
index f7909e38f7b..165af47b4b8 100644
--- a/source/blender/python/gpu/gpu_py_types.c
+++ b/source/blender/python/gpu/gpu_py_types.c
@@ -29,7 +29,6 @@
#include "gpu_py_types.h" /* own include */
/* -------------------------------------------------------------------- */
-
/** \name GPU Types Module
* \{ */
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c
index 67555b70be2..be53a1cb067 100644
--- a/source/blender/render/intern/source/render_texture.c
+++ b/source/blender/render/intern/source/render_texture.c
@@ -896,8 +896,6 @@ static int cubemap_glob(const float n[3], float x, float y, float z, float *adr1
/* ------------------------------------------------------------------------- */
-/* ------------------------------------------------------------------------- */
-
static void do_2d_mapping(
const MTex *mtex, float texvec[3], const float n[3], float dxt[3], float dyt[3])
{
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 10773cf58e1..6a5800f4288 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -1061,6 +1061,7 @@ void wm_homefile_read(bContext *C,
}
}
+/* -------------------------------------------------------------------- */
/** \name WM History File API
* \{ */
@@ -1189,6 +1190,10 @@ static void wm_history_file_update(void)
/** \} */
+/* -------------------------------------------------------------------- */
+/** \name Save Main .blend File (internal)
+ * \{ */
+
/* screen can be NULL */
static ImBuf *blend_file_thumb(const bContext *C,
Scene *scene,
@@ -1422,7 +1427,11 @@ static bool wm_file_write(bContext *C, const char *filepath, int fileflags, Repo
return ok;
}
-/************************ autosave ****************************/
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Auto-Save API
+ * \{ */
void wm_autosave_location(char *filepath)
{
@@ -1550,6 +1559,9 @@ void wm_autosave_read(bContext *C, ReportList *reports)
WM_file_read(C, filename, reports);
}
+/** \} */
+
+/* -------------------------------------------------------------------- */
/** \name Initialize WM_OT_open_xxx properties
*
* Check if load_ui was set by the caller.
@@ -1593,8 +1605,8 @@ void WM_file_tag_modified(void)
}
}
+/* -------------------------------------------------------------------- */
/** \name Preferences/startup save & load.
- *
* \{ */
/**
@@ -2035,8 +2047,8 @@ void WM_OT_read_factory_settings(wmOperatorType *ot)
/** \} */
-/** \name Open main .blend file.
- *
+/* -------------------------------------------------------------------- */
+/** \name Open Main .blend File Utilities
* \{ */
/**
@@ -2062,8 +2074,7 @@ static bool wm_file_read_opwrap(bContext *C,
return success;
}
-/* Generic operator state utilities
- *********************************************/
+/* Generic operator state utilities */
static void create_operator_state(wmOperatorType *ot, int first_state)
{
@@ -2101,8 +2112,11 @@ static int operator_state_dispatch(bContext *C, wmOperator *op, OperatorDispatch
return OPERATOR_CANCELLED;
}
-/* Open Mainfile operator
- ********************************************/
+/** \} */
+
+/* -------------------------------------------------------------------- */
+/** \name Open Main .blend File Operator
+ * \{ */
enum {
OPEN_MAINFILE_STATE_DISCARD_CHANGES,
@@ -2326,8 +2340,8 @@ void WM_OT_open_mainfile(wmOperatorType *ot)
/** \} */
-/** \name Reload (revert) main .blend file.
- *
+/* -------------------------------------------------------------------- */
+/** \name Reload (revert) Main .blend File Operator
* \{ */
static int wm_revert_mainfile_exec(bContext *C, wmOperator *op)
@@ -2381,8 +2395,8 @@ void WM_OT_revert_mainfile(wmOperatorType *ot)
/** \} */
+/* -------------------------------------------------------------------- */
/** \name Recover last session & auto-save.
- *
* \{ */
void WM_recover_last_session(bContext *C, ReportList *reports)
@@ -2478,8 +2492,8 @@ void WM_OT_recover_auto_save(wmOperatorType *ot)
/** \} */
-/** \name Save main .blend file.
- *
+/* -------------------------------------------------------------------- */
+/** \name Save Main .blend File Operator
* \{ */
static void wm_filepath_default(char *filepath)
@@ -2707,8 +2721,8 @@ void WM_OT_save_mainfile(wmOperatorType *ot)
/** \} */
+/* -------------------------------------------------------------------- */
/** \name Auto-execution of scripts warning popup
- *
* \{ */
static void wm_block_autorun_warning_ignore(bContext *C, void *arg_block, void *UNUSED(arg))
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c
index 0a68d2ce6ef..e175dbfbb96 100644
--- a/source/creator/creator_args.c
+++ b/source/creator/creator_args.c
@@ -383,11 +383,11 @@ fail:
/** \} */
/* -------------------------------------------------------------------- */
+/** \name Utilities Python Context Macro (#BPY_CTX_SETUP)
+ * \{ */
# ifdef WITH_PYTHON
-/** \name Utilities Python Context Macro (#BPY_CTX_SETUP)
- * \{ */
struct BlendePyContextStore {
wmWindowManager *wm;
Scene *scene;
More information about the Bf-blender-cvs
mailing list