diff options
author | Bastien Montagne <bastien@blender.org> | 2020-05-13 11:37:02 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-05-13 11:37:02 +0300 |
commit | cda25f8f381d9596951062f22c66bca8302fe84f (patch) | |
tree | c60e1fff0d76e7c99684246917d4eb3ce60e14e6 | |
parent | 79511fca205b9a3edd9db727db8535c01e527fdd (diff) |
Fix T76646: Crash when changing Size in Add Cube pop-up in some cases.
Remove resetting of ID uuid session counter, it is not really needed
anymore, and not trivial to do this properly everytime.
Thanks @brecht for investigating this.
-rw-r--r-- | source/blender/blenkernel/BKE_lib_id.h | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/lib_id.c | 6 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 6 |
3 files changed, 0 insertions, 13 deletions
diff --git a/source/blender/blenkernel/BKE_lib_id.h b/source/blender/blenkernel/BKE_lib_id.h index 0c91ba6231b..980d5ebc43a 100644 --- a/source/blender/blenkernel/BKE_lib_id.h +++ b/source/blender/blenkernel/BKE_lib_id.h @@ -72,7 +72,6 @@ void BKE_libblock_init_empty(struct ID *id) ATTR_NONNULL(1); /* When an ID's uuid is of that value, it is unset/invalid (e.g. for runtime IDs, etc.). */ #define MAIN_ID_SESSION_UUID_UNSET 0 -void BKE_lib_libblock_session_uuid_reset(void); void BKE_lib_libblock_session_uuid_ensure(struct ID *id); void BKE_lib_libblock_session_uuid_renew(struct ID *id); diff --git a/source/blender/blenkernel/intern/lib_id.c b/source/blender/blenkernel/intern/lib_id.c index d1337620de8..e976d59ce16 100644 --- a/source/blender/blenkernel/intern/lib_id.c +++ b/source/blender/blenkernel/intern/lib_id.c @@ -1063,12 +1063,6 @@ void BKE_libblock_init_empty(ID *id) /* ********** ID session-wise UUID management. ********** */ static uint global_session_uuid = 0; -/** Reset the session-wise uuid counter (used when reading a new file e.g.). */ -void BKE_lib_libblock_session_uuid_reset() -{ - global_session_uuid = 0; -} - /** * Generate a session-wise uuid for the given \a id. * diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 446449455dd..b9f0e3686db 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -617,9 +617,6 @@ bool WM_file_read(bContext *C, const char *filepath, ReportList *reports) UI_view2d_zoom_cache_reset(); - /* Reset session-wise ID UUID counter. */ - BKE_lib_libblock_session_uuid_reset(); - /* first try to append data from exotic file formats... */ /* it throws error box when file doesn't exist and returns -1 */ /* note; it should set some error message somewhere... (ton) */ @@ -926,9 +923,6 @@ void wm_homefile_read(bContext *C, } } - /* Reset session-wise ID UUID counter. */ - BKE_lib_libblock_session_uuid_reset(); - if (!use_factory_settings || (filepath_startup[0] != '\0')) { if (BLI_access(filepath_startup, R_OK) == 0) { success = BKE_blendfile_read(C, |