[Bf-blender-cvs] [140f7ac389d] id_override_static: Cleanup: remove timer-like check for auto-ID-override generation.
Bastien Montagne
noreply at git.blender.org
Fri Nov 24 17:15:30 CET 2017
Commit: 140f7ac389dd209fc2cfa44002a88fdef1fc50be
Author: Bastien Montagne
Date: Fri Nov 24 17:10:30 2017 +0100
Branches: id_override_static
https://developer.blender.org/rB140f7ac389dd209fc2cfa44002a88fdef1fc50be
Cleanup: remove timer-like check for auto-ID-override generation.
===================================================================
M source/blender/blenkernel/BKE_library_override.h
M source/blender/blenkernel/intern/library_override.c
M source/blender/makesdna/DNA_ID.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_library_override.h b/source/blender/blenkernel/BKE_library_override.h
index ebb1e9d80a7..7deb7e2e862 100644
--- a/source/blender/blenkernel/BKE_library_override.h
+++ b/source/blender/blenkernel/BKE_library_override.h
@@ -64,7 +64,7 @@ void BKE_override_property_operation_delete(
bool BKE_override_status_check_local(struct ID *local);
bool BKE_override_status_check_reference(struct ID *local);
-bool BKE_override_operations_create(struct ID *local, const bool no_skip);
+bool BKE_override_operations_create(struct ID *local);
void BKE_main_override_operations_create(struct Main *bmain);
void BKE_override_update(struct Main *bmain, struct ID *local);
diff --git a/source/blender/blenkernel/intern/library_override.c b/source/blender/blenkernel/intern/library_override.c
index d2c55decb19..2d345e47d4b 100644
--- a/source/blender/blenkernel/intern/library_override.c
+++ b/source/blender/blenkernel/intern/library_override.c
@@ -448,20 +448,13 @@ bool BKE_override_status_check_reference(ID *local)
* are much cheaper.
*
* \return true is new overriding op was created, or some local data was reset. */
-bool BKE_override_operations_create(ID *local, const bool no_skip)
+bool BKE_override_operations_create(ID *local)
{
BLI_assert(local->override != NULL);
const bool is_template = (local->override->reference == NULL);
bool ret = false;
if (!is_template && local->flag & LIB_AUTOOVERRIDE) {
- /* This prevents running that (heavy) callback too often when editing data. */
- const double currtime = PIL_check_seconds_timer();
- if (!no_skip && (currtime - local->override->last_auto_run) < OVERRIDE_AUTO_CHECK_DELAY) {
- return ret;
- }
- local->override->last_auto_run = currtime;
-
PointerRNA rnaptr_local, rnaptr_reference;
RNA_id_pointer_create(local, &rnaptr_local);
RNA_id_pointer_create(local->override->reference, &rnaptr_reference);
@@ -492,7 +485,7 @@ void BKE_main_override_operations_create(Main *bmain)
for (id = lb->first; id; id = id->next) {
/* TODO Maybe we could also add an 'override update' tag e.g. when tagging for DEG update? */
if (id->lib == NULL && id->override != NULL && id->override->reference != NULL && (id->flag & LIB_AUTOOVERRIDE)) {
- BKE_override_operations_create(id, true);
+ BKE_override_operations_create(id);
}
}
}
@@ -619,7 +612,7 @@ ID *BKE_override_operations_store_start(OverrideStorage *override_storage, ID *l
}
/* Forcefully ensure we know about all needed override operations. */
- BKE_override_operations_create(local, true);
+ BKE_override_operations_create(local);
ID *storage_id;
#ifdef DEBUG_OVERRIDE_TIMEIT
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index 7bb9a8e4566..7cd3dc60473 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -180,9 +180,6 @@ typedef struct IDOverride {
/* Temp ID storing extra override data (used for differential operations only currently).
* Always NULL outside of read/write context. */
struct ID *storage;
-
- /* Runtime data. */
- double last_auto_run; /* Last time auto-override detection was run, to avoid too mush overhead on that. */
} IDOverride;
More information about the Bf-blender-cvs
mailing list