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-07-15 14:08:33 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-07-15 14:09:39 +0300
commitddc7e5f1b6b3ee98c2753b224d0c97b4b09802b6 (patch)
tree03f8705e82b1894d6803c7cd1d2822b72638fd3d
parente509f9c3a0b59bf4ec013455090de73dd9a9619c (diff)
Cleanup: improve comments, remove debug printf
-rw-r--r--release/scripts/presets/keyconfig/keymap_data/blender_default.py1
-rw-r--r--source/blender/blenkernel/intern/layer.c1
-rw-r--r--source/blender/blenlib/intern/BLI_memarena.c3
3 files changed, 3 insertions, 2 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index c5f0ecbc411..cc87e2b91a3 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -5053,7 +5053,6 @@ def km_object_non_modal(params):
])
else:
items.extend([
- # Transfer Sculpt Mode (release to avoid conflict with grease pencil drawing).
# NOTE: this shortcut (while not temporary) is not ideal, see: T89757.
("object.transfer_mode", {"type": 'Q', "value": 'PRESS', "alt": True}, None),
])
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 67b5200179b..8d7e286dc01 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -982,7 +982,6 @@ void BKE_layer_collection_sync(const Scene *scene, ViewLayer *view_layer)
view_layer->object_bases = new_object_bases;
LISTBASE_FOREACH (Base *, base, &view_layer->object_bases) {
- printf("%s\n", base->object->id.name);
BKE_base_eval_flags(base);
}
diff --git a/source/blender/blenlib/intern/BLI_memarena.c b/source/blender/blenlib/intern/BLI_memarena.c
index de2ce44be44..0ab27a5adad 100644
--- a/source/blender/blenlib/intern/BLI_memarena.c
+++ b/source/blender/blenlib/intern/BLI_memarena.c
@@ -185,6 +185,9 @@ void *BLI_memarena_calloc(MemArena *ma, size_t size)
*
* \note Useful for multi-threaded tasks that need a thread-local #MemArena
* that is kept after the multi-threaded operation is completed.
+ *
+ * \note Avoid accumulating memory pools where possible
+ * as any unused memory in `ma_src` is wasted every merge.
*/
void BLI_memarena_merge(MemArena *ma_dst, MemArena *ma_src)
{