Commit: b0b7c2482f785ea269917218c1a3be3bb72e3e3e
Author: Bastien Montagne
Date: Sat Feb 9 20:08:35 2019 +0100
Branches: asset-engine
https://developer.blender.org/rBb0b7c2482f785ea269917218c1a3be3bb72e3e3e
Merge branch 'master' into asset-engine
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_280.c
index 681a265f916,5e0eb849341..36262c809b9
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -2790,40 -2793,29 +2794,64 @@@ void blo_do_versions_280(FileData *fd,
mat->a = 1.0f;
}
}
+
+ for (Scene *scene = bmain->scene.first; scene; scene =
scene->id.next) {
+ enum {
+ R_ALPHAKEY = 2,
+ };
+ scene->r.seq_flag &= ~(
+ R_SEQ_DEPRECATED_0 |
+ R_SEQ_DEPRECATED_1 |
+ R_SEQ_DEPRECATED_2);
+ scene->r.color_mgt_flag &=
~R_COLOR_MANAGEMENT_DEPRECATED_1;
+ if (scene->r.alphamode == R_ALPHAKEY) {
+ scene->r.alphamode = R_ADDSKY;
+ }
+ ToolSettings *ts = scene->toolsettings;
+ ts->particle.flag &= ~PE_DEPRECATED_6;
+ if (ts->sculpt != NULL) {
+ ts->sculpt->flags &= ~SCULPT_FLAG_DEPRECATED_6;
+ }
+ }
+ }
+
+ {
+ /* Versioning code until next subversion bump goes here. */
+
}
+
+
+
+
+
+
+ if (1 || !DNA_struct_find(fd->filesdna, "AssetUUID")) { /* struct_find
will have to wait, not working for now... */
+ /* Move non-op filebrowsers to 'library browsing' type/mode. */
+ for (bScreen *screen = bmain->screen.first; screen; screen =
screen->id.next) {
+ for (ScrArea *sa = screen->areabase.first; sa; sa =
sa->next) {
+ for (SpaceLink *sl = sa->spacedata.first; sl;
sl = sl->next) {
+ if (sl->spacetype == SPACE_FILE) {
+ SpaceFile *sfile = (SpaceFile
*)sl;
+ if (sfile->params != NULL) {
+ sfile->params->type =
FILE_LOADLIB;
+ sfile->params->filter =
FILE_TYPE_FOLDER | FILE_TYPE_BLENDERLIB;
+ /* For now, always init
filterid to 'all true' */
+
sfile->params->filter_id = FILTER_ID_AC | FILTER_ID_AR | FILTER_ID_BR |
FILTER_ID_CA |
+
FILTER_ID_CU | FILTER_ID_GD | FILTER_ID_GR | FILTER_ID_IM |
+
FILTER_ID_LA | FILTER_ID_LS | FILTER_ID_LT | FILTER_ID_MA |
+
FILTER_ID_MB | FILTER_ID_MC | FILTER_ID_ME | FILTER_ID_MSK |
+
FILTER_ID_NT | FILTER_ID_OB | FILTER_ID_PA | FILTER_ID_PAL |
+
FILTER_ID_PC | FILTER_ID_SCE | FILTER_ID_SPK | FILTER_ID_SO |
+
FILTER_ID_TE | FILTER_ID_TXT | FILTER_ID_VF | FILTER_ID_WO |
+
FILTER_ID_CF;
+ }
+ }
+ }
+ }
+ }
+ }
+
+
+
+
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
