diff options
| -rw-r--r-- | source/blender/blenkernel/BKE_lib_override.h | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/lib_override.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/object/object_relations.c | 2 |
3 files changed, 5 insertions, 9 deletions
diff --git a/source/blender/blenkernel/BKE_lib_override.h b/source/blender/blenkernel/BKE_lib_override.h index 786d0b5ba97..411df66fe36 100644 --- a/source/blender/blenkernel/BKE_lib_override.h +++ b/source/blender/blenkernel/BKE_lib_override.h @@ -108,9 +108,7 @@ bool BKE_lib_override_library_property_operation_operands_validate( bool BKE_lib_override_library_status_check_local(struct Main *bmain, struct ID *local); bool BKE_lib_override_library_status_check_reference(struct Main *bmain, struct ID *local); -bool BKE_lib_override_library_operations_create(struct Main *bmain, - struct ID *local, - const bool force_auto); +bool BKE_lib_override_library_operations_create(struct Main *bmain, struct ID *local); void BKE_lib_override_library_main_operations_create(struct Main *bmain, const bool force_auto); void BKE_lib_override_library_operations_tag(struct IDOverrideLibraryProperty *override_property, diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c index 28d8b5932a1..95dc0deae46 100644 --- a/source/blender/blenkernel/intern/lib_override.c +++ b/source/blender/blenkernel/intern/lib_override.c @@ -739,9 +739,7 @@ bool BKE_lib_override_library_status_check_reference(Main *bmain, ID *local) * Generating diff values and applying overrides are much cheaper. * * \return true if new overriding op was created, or some local data was reset. */ -bool BKE_lib_override_library_operations_create(Main *bmain, - ID *local, - const bool UNUSED(force_auto)) +bool BKE_lib_override_library_operations_create(Main *bmain, ID *local) { BLI_assert(local->override_library != NULL); const bool is_template = (local->override_library->reference == NULL); @@ -802,7 +800,7 @@ static void lib_override_library_operations_create_cb(TaskPool *__restrict pool, Main *bmain = BLI_task_pool_user_data(pool); ID *id = taskdata; - BKE_lib_override_library_operations_create(bmain, id, false); + BKE_lib_override_library_operations_create(bmain, id); } /** Check all overrides from given \a bmain and create/update overriding operations as needed. */ @@ -1065,7 +1063,7 @@ ID *BKE_lib_override_library_operations_store_start(Main *bmain, } /* Forcefully ensure we know about all needed override operations. */ - BKE_lib_override_library_operations_create(bmain, local, false); + BKE_lib_override_library_operations_create(bmain, local); ID *storage_id; #ifdef DEBUG_OVERRIDE_TIMEIT diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 4a05658fc00..7ec236de6f0 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -2404,7 +2404,7 @@ static int make_override_library_exec(bContext *C, wmOperator *op) BKE_view_layer_base_select_and_set_active(view_layer, base); } /* We still want to store all objects' current override status (i.e. change of parent). */ - BKE_lib_override_library_operations_create(bmain, &new_ob->id, true); + BKE_lib_override_library_operations_create(bmain, &new_ob->id); } } FOREACH_COLLECTION_OBJECT_RECURSIVE_END; |