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:
authorCampbell Barton <ideasman42@gmail.com>2021-08-12 09:10:10 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-08-12 09:15:01 +0300
commit83603ba26a506a9b666bb7b0b1b6856ac69e834c (patch)
tree5609f87457de8f35b7e2efed9bf8434a324f6c3e
parent497bc4d19977abc7b9e2c0f5024a23057e680954 (diff)
Cleanup: comments/disabled code
- Remove old comment for editors with weak syntax highlighting. - Remove disabled code to initialize Blender with a file path. - Remove file name references to function names since these were outdated, modern development environments can look up this info.
-rw-r--r--source/blender/makesrna/intern/rna_access.c3
-rw-r--r--source/blender/windowmanager/intern/wm_init_exit.c45
2 files changed, 22 insertions, 26 deletions
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index ac734efed8b..a795d78a058 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -883,8 +883,7 @@ bool RNA_struct_is_a(const StructRNA *type, const StructRNA *srna)
PropertyRNA *RNA_struct_find_property(PointerRNA *ptr, const char *identifier)
{
- if (identifier[0] == '[' && identifier[1] == '"') { /* " (dummy comment to avoid confusing some
- * function lists in text editors) */
+ if (identifier[0] == '[' && identifier[1] == '"') {
/* id prop lookup, not so common */
PropertyRNA *r_prop = NULL;
PointerRNA r_ptr; /* only support single level props */
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c
index 4b839384853..a8d2e000108 100644
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@ -222,7 +222,10 @@ static void sound_jack_sync_callback(Main *bmain, int mode, double time)
}
}
-/* only called once, for startup */
+/**
+ * Initialize Blender and load the startup file & preferences
+ * (only called once).
+ */
void WM_init(bContext *C, int argc, const char **argv)
{
@@ -248,24 +251,22 @@ void WM_init(bContext *C, int argc, const char **argv)
ED_undosys_type_init();
- BKE_library_callback_free_notifier_reference_set(
- WM_main_remove_notifier_reference); /* lib_id.c */
- BKE_region_callback_free_gizmomap_set(wm_gizmomap_remove); /* screen.c */
+ BKE_library_callback_free_notifier_reference_set(WM_main_remove_notifier_reference);
+ BKE_region_callback_free_gizmomap_set(wm_gizmomap_remove);
BKE_region_callback_refresh_tag_gizmomap_set(WM_gizmomap_tag_refresh);
- BKE_library_callback_remap_editor_id_reference_set(
- WM_main_remap_editor_id_reference); /* lib_id.c */
- BKE_spacedata_callback_id_remap_set(ED_spacedata_id_remap); /* screen.c */
+ BKE_library_callback_remap_editor_id_reference_set(WM_main_remap_editor_id_reference);
+ BKE_spacedata_callback_id_remap_set(ED_spacedata_id_remap);
DEG_editors_set_update_cb(ED_render_id_flush_update, ED_render_scene_update);
- ED_spacetypes_init(); /* editors/space_api/spacetype.c */
+ ED_spacetypes_init();
ED_node_init_butfuncs();
BLF_init();
BLT_lang_init();
- /* Must call first before doing any '.blend' file reading,
- * since versioning code may create new IDs... See T57066. */
+ /* Must call first before doing any `.blend` file reading,
+ * since versioning code may create new IDs. See T57066. */
BLT_lang_set(NULL);
/* Init icons before reading .blend files for preview icons, which can
@@ -273,7 +274,7 @@ void WM_init(bContext *C, int argc, const char **argv)
* for scripts that do background processing with preview icons. */
BKE_icons_init(BIFICONID_LAST);
- /* reports can't be initialized before the wm,
+ /* Reports can't be initialized before the window-manager,
* but keep before file reading, since that may report errors */
wm_init_reports(C);
@@ -316,10 +317,14 @@ void WM_init(bContext *C, int argc, const char **argv)
NULL,
&params_file_read_post);
- /* Call again to set from userpreferences... */
+ /* NOTE: leave `G_MAIN->name` set to an empty string since this
+ * matches behavior after loading a new file. */
+ BLI_assert(G_MAIN->name[0] == '\0');
+
+ /* Call again to set from preferences. */
BLT_lang_set(NULL);
- /* For fsMenu. Called here so can include user preference paths if needed. */
+ /* For file-system. Called here so can include user preference paths if needed. */
ED_file_init();
/* That one is generated on demand, we need to be sure it's clear on init. */
@@ -328,12 +333,13 @@ void WM_init(bContext *C, int argc, const char **argv)
if (!G.background) {
#ifdef WITH_INPUT_NDOF
- /* sets 3D mouse deadzone */
+ /* Sets 3D mouse dead-zone. */
WM_ndof_deadzone_set(U.ndof_deadzone);
#endif
WM_init_opengl();
if (!WM_platform_support_perform_checks()) {
+ /* No attempt to avoid memory leaks here. */
exit(-1);
}
@@ -348,8 +354,7 @@ void WM_init(bContext *C, int argc, const char **argv)
BPY_python_start(C, argc, argv);
BPY_python_reset(C);
#else
- (void)argc; /* unused */
- (void)argv; /* unused */
+ UNUSED_VARS(argc, argv);
#endif
if (!G.background) {
@@ -366,14 +371,6 @@ void WM_init(bContext *C, int argc, const char **argv)
wm_history_file_read();
- /* allow a path of "", this is what happens when making a new file */
-#if 0
- if (BKE_main_blendfile_path_from_global()[0] == '\0') {
- BLI_join_dirfile(
- G_MAIN->name, sizeof(G_MAIN->name), BKE_appdir_folder_default(), "untitled.blend");
- }
-#endif
-
BLI_strncpy(G.lib, BKE_main_blendfile_path_from_global(), sizeof(G.lib));
#ifdef WITH_COMPOSITOR