[Bf-blender-cvs] [b31a8e30cba] temp-T73411-view-layer-lazy-cache: Rename to BKE_view_layer_need_resync_tag, BKE_view_layer_synced_ensure
Monique
noreply at git.blender.org
Thu Sep 8 16:27:03 CEST 2022
Commit: b31a8e30cba735e5f5880b9ed59e5576ecc2d9eb
Author: Monique
Date: Thu Sep 8 16:19:13 2022 +0200
Branches: temp-T73411-view-layer-lazy-cache
https://developer.blender.org/rBb31a8e30cba735e5f5880b9ed59e5576ecc2d9eb
Rename to BKE_view_layer_need_resync_tag, BKE_view_layer_synced_ensure
===================================================================
M source/blender/blenkernel/BKE_layer.h
M source/blender/blenkernel/intern/DerivedMesh.cc
M source/blender/blenkernel/intern/blendfile_link_append.c
M source/blender/blenkernel/intern/collection.c
M source/blender/blenkernel/intern/context.c
M source/blender/blenkernel/intern/fluid.c
M source/blender/blenkernel/intern/layer.c
M source/blender/blenkernel/intern/layer_utils.c
M source/blender/blenkernel/intern/lib_override.cc
M source/blender/blenkernel/intern/mball.cc
M source/blender/blenkernel/intern/object.cc
M source/blender/blenkernel/intern/paint.cc
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/rigidbody.c
M source/blender/blenkernel/intern/scene.cc
M source/blender/blenloader/intern/versioning_280.c
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
M source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
M source/blender/draw/engines/overlay/overlay_extra.c
M source/blender/draw/intern/draw_common.c
M source/blender/draw/intern/draw_manager.c
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/animation/anim_markers.c
M source/blender/editors/armature/armature_select.c
M source/blender/editors/armature/editarmature_undo.c
M source/blender/editors/armature/pose_select.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/curve/editcurve_add.c
M source/blender/editors/curve/editcurve_select.c
M source/blender/editors/curve/editcurve_undo.c
M source/blender/editors/curve/editfont.c
M source/blender/editors/curve/editfont_undo.c
M source/blender/editors/gpencil/gpencil_armature.c
M source/blender/editors/gpencil/gpencil_convert.c
M source/blender/editors/interface/interface_ops.cc
M source/blender/editors/lattice/editlattice_select.c
M source/blender/editors/lattice/editlattice_undo.c
M source/blender/editors/mesh/editmesh_path.c
M source/blender/editors/mesh/editmesh_polybuild.c
M source/blender/editors/mesh/editmesh_select.c
M source/blender/editors/mesh/editmesh_undo.c
M source/blender/editors/metaball/editmball_undo.c
M source/blender/editors/metaball/mball_edit.c
M source/blender/editors/object/object_add.cc
M source/blender/editors/object/object_bake_api.c
M source/blender/editors/object/object_collection.c
M source/blender/editors/object/object_constraint.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/object/object_hook.c
M source/blender/editors/object/object_modes.c
M source/blender/editors/object/object_modifier.cc
M source/blender/editors/object/object_relations.c
M source/blender/editors/object/object_select.c
M source/blender/editors/object/object_utils.c
M source/blender/editors/physics/particle_edit.c
M source/blender/editors/physics/particle_edit_undo.c
M source/blender/editors/physics/particle_object.c
M source/blender/editors/physics/rigidbody_constraint.c
M source/blender/editors/render/render_internal.cc
M source/blender/editors/render/render_preview.cc
M source/blender/editors/screen/screen_context.c
M source/blender/editors/screen/screen_edit.c
M source/blender/editors/sculpt_paint/paint_image_ops_paint.cc
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/sculpt_paint/paint_utils.c
M source/blender/editors/sculpt_paint/sculpt_ops.c
M source/blender/editors/sculpt_paint/sculpt_undo.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/editors/space_buttons/buttons_texture.c
M source/blender/editors/space_clip/tracking_ops_orient.c
M source/blender/editors/space_image/image_edit.c
M source/blender/editors/space_image/space_image.c
M source/blender/editors/space_info/info_stats.cc
M source/blender/editors/space_nla/nla_channels.c
M source/blender/editors/space_outliner/outliner_collections.cc
M source/blender/editors/space_outliner/outliner_dragdrop.cc
M source/blender/editors/space_outliner/outliner_draw.cc
M source/blender/editors/space_outliner/outliner_edit.cc
M source/blender/editors/space_outliner/outliner_select.cc
M source/blender/editors/space_outliner/outliner_sync.cc
M source/blender/editors/space_outliner/outliner_tools.cc
M source/blender/editors/space_outliner/outliner_tree.cc
M source/blender/editors/space_outliner/outliner_utils.cc
M source/blender/editors/space_outliner/tree/tree_display_view_layer.cc
M source/blender/editors/space_view3d/space_view3d.c
M source/blender/editors/space_view3d/view3d_buttons.c
M source/blender/editors/space_view3d/view3d_cursor_snap.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_gizmo_armature.c
M source/blender/editors/space_view3d/view3d_gizmo_camera.c
M source/blender/editors/space_view3d/view3d_gizmo_empty.c
M source/blender/editors/space_view3d/view3d_gizmo_forcefield.c
M source/blender/editors/space_view3d/view3d_gizmo_light.c
M source/blender/editors/space_view3d/view3d_gizmo_preselect_type.c
M source/blender/editors/space_view3d/view3d_gizmo_ruler.c
M source/blender/editors/space_view3d/view3d_header.c
M source/blender/editors/space_view3d/view3d_navigate.c
M source/blender/editors/space_view3d/view3d_select.cc
M source/blender/editors/space_view3d/view3d_view.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform_convert.c
M source/blender/editors/transform/transform_convert_action.c
M source/blender/editors/transform/transform_convert_gpencil.c
M source/blender/editors/transform/transform_convert_graph.c
M source/blender/editors/transform/transform_convert_object.c
M source/blender/editors/transform/transform_convert_object_texspace.c
M source/blender/editors/transform/transform_convert_particle.c
M source/blender/editors/transform/transform_convert_sculpt.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_gizmo_3d.c
M source/blender/editors/transform/transform_orientations.c
M source/blender/editors/transform/transform_snap.c
M source/blender/editors/transform/transform_snap_object.cc
M source/blender/editors/undo/ed_undo.c
M source/blender/editors/util/ed_util.c
M source/blender/io/alembic/exporter/abc_subdiv_disabler.cc
M source/blender/io/alembic/intern/alembic_capi.cc
M source/blender/io/collada/BlenderContext.cpp
M source/blender/io/collada/collada_utils.cpp
M source/blender/io/gpencil/intern/gpencil_io_base.cc
M source/blender/io/stl/importer/stl_import.cc
M source/blender/io/usd/intern/usd_capi_import.cc
M source/blender/io/wavefront_obj/importer/obj_importer.cc
M source/blender/makesrna/intern/rna_brush.c
M source/blender/makesrna/intern/rna_layer.c
M source/blender/makesrna/intern/rna_object_api.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/nodes/geometry/node_geometry_tree.cc
M source/blender/nodes/shader/node_shader_tree.cc
M source/blender/nodes/texture/node_texture_tree.c
M source/blender/windowmanager/intern/wm_toolsystem.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index 48f1b50a89d..8f058432044 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -371,7 +371,7 @@ void BKE_view_layer_visible_bases_iterator_end(BLI_Iterator *iter);
data_.object_type = _object_type; \
data_.view_layer = _view_layer; \
data_.v3d = _v3d; \
- BKE_view_layer_ensure_sync(_scene, _view_layer); \
+ BKE_view_layer_synced_ensure(_scene, _view_layer); \
data_.base_active = BKE_view_layer_active_base_get(_view_layer); \
ITER_BEGIN (BKE_view_layer_bases_in_mode_iterator_begin, \
BKE_view_layer_bases_in_mode_iterator_next, \
@@ -422,7 +422,7 @@ void BKE_view_layer_visible_bases_iterator_end(BLI_Iterator *iter);
struct ObjectsVisibleIteratorData data_ = {NULL}; \
data_.view_layer = _view_layer; \
data_.v3d = _v3d; \
- BKE_view_layer_ensure_sync(_scene, _view_layer); \
+ BKE_view_layer_synced_ensure(_scene, _view_layer); \
ITER_BEGIN (BKE_view_layer_visible_bases_iterator_begin, \
BKE_view_layer_visible_bases_iterator_next, \
BKE_view_layer_visible_bases_iterator_end, \
@@ -439,7 +439,7 @@ void BKE_view_layer_visible_bases_iterator_end(BLI_Iterator *iter);
{ \
Object *_instance; \
Base *_base; \
- BKE_view_layer_ensure_sync(scene, view_layer); \
+ BKE_view_layer_synced_ensure(scene, view_layer); \
for (_base = (Base *)BKE_view_layer_object_bases_get(view_layer)->first; _base; \
_base = _base->next) { \
_instance = _base->object;
@@ -582,11 +582,8 @@ struct Base *BKE_view_layer_active_base_get(struct ViewLayer *view_layer);
struct LayerCollection *BKE_view_layer_active_collection_get(struct ViewLayer *view_layer);
-void BKE_view_layer_tag_out_of_sync(struct ViewLayer *view_layer);
-void BKE_view_layer_ensure_sync(const struct Scene *scene, struct ViewLayer *view_layer);
-// This should not exist in the final solution.
-const struct ListBase *BKE_view_layer_object_bases_get_const(const struct ViewLayer *view_layer,
- const char *name);
+void BKE_view_layer_need_resync_tag(struct ViewLayer *view_layer);
+void BKE_view_layer_synced_ensure(const struct Scene *scene, struct ViewLayer *view_layer);
struct ViewLayerAOV *BKE_view_layer_add_aov(struct ViewLayer *view_layer);
void BKE_view_layer_remove_aov(struct ViewLayer *view_layer, struct ViewLayerAOV *aov);
diff --git a/source/blender/blenkernel/intern/DerivedMesh.cc b/source/blender/blenkernel/intern/DerivedMesh.cc
index 95b45fca7d8..e9c32b760e4 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.cc
+++ b/source/blender/blenkernel/intern/DerivedMesh.cc
@@ -1759,7 +1759,7 @@ static void object_get_datamask(const Depsgraph *depsgraph,
return;
}
- BKE_view_layer_ensure_sync(scene, view_layer);
+ BKE_view_layer_synced_ensure(scene, view_layer);
Object *actob = BKE_view_layer_active_object_get(view_layer);
if (actob) {
actob = DEG_get_original_object(actob);
diff --git a/source/blender/blenkernel/intern/blendfile_link_append.c b/source/blender/blenkernel/intern/blendfile_link_append.c
index 26fa33d5707..e3b76122ff0 100644
--- a/source/blender/blenkernel/intern/blendfile_link_append.c
+++ b/source/blender/blenkernel/intern/blendfile_link_append.c
@@ -507,7 +507,7 @@ static void loose_data_instantiate_object_base_instance_init(Main *bmain,
}
BKE_collection_object_add(bmain, collection, ob);
- BKE_view_layer_ensure_sync(scene, view_layer);
+ BKE_view_layer_synced_ensure(scene, view_layer);
Base *base = BKE_view_layer_base_find(view_layer, ob);
if (v3d != NULL) {
@@ -705,7 +705,7 @@ static void loose_data_instantiate_collection_process(
else {
/* Add collection as child of active collection. */
BKE_collection_child_add(bmain, active_collection, collection);
- BKE_view_layer_ensure_sync(scene, view_layer);
+ BKE_view_layer_synced_ensure(scene, view_layer);
if ((lapp_context->params->flag & FILE_AUTOSELECT) != 0) {
LISTBASE_FOREACH (CollectionObject *, coll_ob, &collection->gobject) {
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c
index afb5f4ef2a6..69fe4c17657 100644
--- a/source/blender/blenkernel/intern/collection.c
+++ b/source/blender/blenkernel/intern/collection.c
@@ -859,7 +859,7 @@ Base *BKE_collection_or_layer_objects(const Scene *scene,
if (collection) {
return BKE_collection_object_cache_get(collection).first;
}
- BKE_view_layer_ensure_sync(scene, view_layer);
+ BKE_view_layer_synced_ensure(scene, view_layer);
return BKE_view_layer_object_bases_get(view_layer)->first;
}
@@ -1755,7 +1755,7 @@ static bool collection_objects_select(const Scene *scene,
return false;
}
- BKE_view_layer_ensure_sync(scene, view_layer);
+ BKE_view_layer_synced_ensure(scene, view_layer);
LISTBASE_FOREACH (CollectionObject *, cob, &collection->gobject) {
Base *base = BKE_view_layer_base_find(view_layer, cob->ob);
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index 69673d93c20..ceb84d213c3 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -440,7 +440,7 @@ static int ctx_data_base_collection_get(const bContext *C, const char *member, L
Scene *scene = CTX_data_scene(C);
ViewLayer *view_layer = CTX_data_view_layer(C);
- BKE_view_layer_ensure_sync(scene, view_layer);
+ BKE_view_layer_synced_ensure(scene, view_layer);
bool ok = false;
@@ -1365,7 +1365,7 @@ struct Base *CTX_data_active_base(const bContext *C)
}
const Scene *scene = CTX_data_scene(C);
ViewLayer *view_layer = CTX_data_view_layer(C);
- BKE_view_layer_ensure_sync(scene, view_layer);
+ BKE_view_layer_synced_ensure(scene, view_layer);
return BKE_view_layer_base_find(view_layer, ob);
}
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index d354dfb0939..6e53254d162 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -561,7 +561,7 @@ static int get_light(Scene *scene, ViewLayer *view_layer, float *light)
int found_light = 0;
/* Try to find a lamp, preferably local. */
- BKE_view_layer_ensure_sync(scene, view_layer);
+ BKE_view_layer_synced_ensure(scene, view_layer);
LISTBASE_FOREACH (Base *, base_tmp, BKE_view_layer_object_bases_get(view_layer)) {
if (base_tmp->object->type == OB_LAMP) {
Light *la = base_tmp->object->data;
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 244f5f85534..ba638d96224 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -285,7 +285,7 @@ void BKE_view_layer_free_ex(ViewLayer *view_layer, const bool do_id_user)
void BKE_view_layer_selected_objects_tag(const Scene *scene, ViewLayer *view_layer, const int tag)
{
- BKE_view_layer_ensure_sync(scene, view_layer);
+ BKE_view_layer_synced_ensure(scene, view_layer);
LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) {
if ((base->flag & BASE_SELECTED) != 0) {
base->object->flag |= tag;
@@ -311,7 +311,7 @@ static bool find_scene_collection_in_scene_collections(ListBase *lb, const Layer
Object *BKE_view_layer_camera_find(const Scene *scene, ViewLayer *view_layer)
{
- BKE_view_layer_ensure_sync(scene, view_layer);
+ BKE_view_layer_synced_ensure(scene, view_layer);
LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) {
if (base->object->type == OB_CAMERA) {
return base->object;
@@ -381,7 +381,7 @@ static void view_layer_bases_hash_create(ViewLayer *view_layer, const bool do_ba
Base *BKE_view_layer_base_find(ViewLayer *view_layer, Object *ob)
{
BLI_assert_msg((view_layer->flag & VIEW_LAYER_OUT_OF_SYNC) == 0,
- "View layer out of sync, invoke BKE_view_layer_ensure_sync.");
+ "View layer out of sync, invoke BKE_view_layer_synced_ensure.");
if (!view_layer->object_bases_hash) {
view_layer_bases_hash_create(view_layer, false);
}
@@ -391,7 +391,7 @@ Base *BKE_view_layer_base_find(ViewLayer *view_layer, Object *ob)
void BKE_view_layer_base_deselect_all(const Scene *scene, ViewLayer *view_layer)
{
- BKE_view_layer_ensure_sync(scene, view_layer);
+ BKE_view_layer_synced_ensure(scene, view_layer);
LISTBASE_FOREACH (Base *, base, BKE_view_layer_object_bases_get(view_layer)) {
base->flag &= ~BASE_SELECTED;
}
@@ -504,9 +504,9 @@ void BKE_view_layer_copy_data(Scene *scene_dst,
/* Copy layer collections and object bases. */
/* Inline 'BLI_duplicatelist' and update the active base. */
BLI_listbase_clear(&view_layer_dst->object_bases);
- // TODO: perhaps a const cast? BKE_view_layer_ensure_sync(scene_src, view_layer_src);
- LISTBASE_FOREACH (
- const Base *, base_src, BKE_view_layer_object_bases_get_const(view_layer_src, __func__)) {
+ BLI_assert_msg((view_layer_src->flag & VIEW_LAYER_OUT_OF_SYNC) == 0,
+ "View Layer Object Base out of sync.");
+ LISTBASE_FOREACH (const Base *, base_src, &view_layer_src->object_bases) {
Base *base_dst = MEM_dupallocN(base_src);
BLI_addtail(&view_layer_dst->object_bases, base_dst);
if (view_layer_src->basact == base_src) {
@@ -961,13 +961,13 @@ static void layer_collection_resync_unused_layers_free(ViewLayer *view_layer,
}
}
-void BKE_view_layer_tag_out_of_sync(struct ViewLayer *view_layer)
+void BKE_view_layer_need_resync_tag(struct ViewLayer *view_layer)
{
printf("%s: %s\n", __func__, view_layer->name);
view_layer->flag |= VIEW_LAYER_OUT_OF_SYNC;
}
-void BKE_view_layer_ensure_sync(const Scene *scene, struct ViewLayer *view_layer)
+void BKE_view_layer_synced_ensure(const Scene *scene, struct ViewLayer *view_layer)
{
if (view_layer->flag & VIEW_LAYER_OUT_OF_SYNC) {
BKE_layer_collection_sync(scene, view_layer);
@@ -1365,8 +1365,7 @@ void BKE_scene_collectio
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list