[Bf-blender-cvs] [571c1ff7203] asset-engine: Merge branch 'blender2.8' into asset-engine
Bastien Montagne
noreply at git.blender.org
Mon Mar 19 20:00:20 CET 2018
Commit: 571c1ff72039bc91339eac824901b6ab6453bcfe
Author: Bastien Montagne
Date: Mon Mar 19 16:35:17 2018 +0100
Branches: asset-engine
https://developer.blender.org/rB571c1ff72039bc91339eac824901b6ab6453bcfe
Merge branch 'blender2.8' into asset-engine
Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/WM_types.h
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/readfile.c
index 3dd6d5ca186,21eccaff168..7719aa6a7eb
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -10988,16 -10920,13 +11006,18 @@@ static void read_libraries(FileData *ba
/* realid shall never be NULL - unless some source file/lib is broken
* (known case: some directly linked shapekey from a missing lib...). */
- /* BLI_assert(realid != NULL); */
+ /* BLI_assert(*realid != NULL); */
- if (realid && id->uuid) {
++ if (*realid && id->uuid) {
+ /* we can give ownership of that pointer to new ID. */
- realid->uuid = id->uuid;
++ (*realid)->uuid = id->uuid;
+ }
+
- change_idid_adr(mainlist, basefd, id, realid);
+ change_idid_adr(mainlist, basefd, id, *realid);
- MEM_freeN(id);
+ /* We cannot free old lib-ref placeholder ID here anymore, since we use its name
+ * as key in loaded_ids hass. */
+ BLI_addtail(&pending_free_ids, id);
}
id = idn;
}
diff --cc source/blender/windowmanager/WM_api.h
index 9a3fd57ee44,742adda2644..de2f1fc190e
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@@ -496,7 -504,7 +504,8 @@@ enum
WM_JOB_TYPE_POINTCACHE,
WM_JOB_TYPE_DPAINT_BAKE,
WM_JOB_TYPE_ALEMBIC,
+ WM_JOB_TYPE_SHADER_COMPILATION,
+ WM_JOB_TYPE_ASSET_UPDATECHECK,
/* add as needed, screencast, seq proxy build
* if having hard coded values is a problem */
};
diff --cc source/blender/windowmanager/WM_types.h
index 98c938a37a5,a09814cf5dd..f1eedd021ee
--- a/source/blender/windowmanager/WM_types.h
+++ b/source/blender/windowmanager/WM_types.h
@@@ -115,7 -115,7 +115,8 @@@ struct ImBuf
#include "RNA_types.h"
#include "DNA_listBase.h"
+#include "DNA_ID.h"
+ #include "DNA_vec_types.h"
#include "BLI_compiler_attrs.h"
/* exported types for WM */
More information about the Bf-blender-cvs
mailing list