[Bf-blender-cvs] [2ca34e4] master: Docs: minor edits to code comments
Campbell Barton
noreply at git.blender.org
Sun Jan 24 04:37:00 CET 2016
Commit: 2ca34e419e9ed82f2065433d41b7544f17b18ce2
Author: Campbell Barton
Date: Sun Jan 24 14:25:01 2016 +1100
Branches: master
https://developer.blender.org/rB2ca34e419e9ed82f2065433d41b7544f17b18ce2
Docs: minor edits to code comments
===================================================================
M source/blender/windowmanager/intern/wm_files.c
M source/blender/windowmanager/intern/wm_init_exit.c
M source/creator/creator.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 01699b2..845e190 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -469,6 +469,8 @@ static void wm_file_read_post(bContext *C, bool is_startup_file)
BPY_python_reset(C);
addons_loaded = true;
}
+#else
+ UNUSED_VARS(is_startup_file);
#endif /* WITH_PYTHON */
WM_operatortype_last_properties_clear_all();
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 966f0fa..b6b4f42 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -428,8 +428,9 @@ static void wait_for_console_key(void)
}
#endif
-/* called in creator.c even... tsk, split this! */
-/* note, doesnt run exit() call WM_exit() for that */
+/**
+ * \note doesn't run exit() call #WM_exit() for that.
+ */
void WM_exit_ext(bContext *C, const bool do_python)
{
wmWindowManager *wm = C ? CTX_wm_manager(C) : NULL;
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 797db2d..01aff85 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -1785,11 +1785,11 @@ char **environ = NULL;
#endif
/**
- * Blender's main function responsabilities are:
+ * Blender's main function responsibilities are:
* - setup subsystems.
* - handle arguments.
- * - run WM_main() event loop,
- * or exit when running in background mode.
+ * - run #WM_main() event loop,
+ * or exit immediately when running in background mode.
*/
int main(
int argc,
@@ -2071,7 +2071,7 @@ int main(
#endif
if (G.background) {
- /* actually incorrect, but works for now (ton) */
+ /* Using window-manager API in background mode is a bit odd, but works fine. */
WM_exit(C);
}
else {
More information about the Bf-blender-cvs
mailing list