Commit: 90f8900146d60f944fd61131ff695e13dc440b92
Author: Julian Eisel
Date: Sun Dec 2 17:12:29 2018 +0100
Branches: userpref_redesign
https://developer.blender.org/rB90f8900146d60f944fd61131ff695e13dc440b92
Merge branch 'blender2.8' into userpref_redesign
===================================================================
===================================================================
diff --cc release/scripts/addons
index be2df524910,f89d1c9581c..6706c91ecf7
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit be2df5249105015aaafb06def0d1279c559c56ff
-Subproject commit f89d1c9581c03160485a7b4b09fa5d538331fdeb
++Subproject commit 6706c91ecf7dd759293b5a7e0b2b75e3c1d7c2e1
diff --cc source/blender/blenloader/intern/versioning_280.c
index a844a2dc91b,17859d257d0..11e1ce5ac23
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -2428,30 -2433,62 +2433,85 @@@ void blo_do_versions_280(FileData *fd,
}
}
+ if (!MAIN_VERSION_ATLEAST(bmain, 280, 34)) {
+ for (bScreen *screen = bmain->screen.first; screen; screen =
screen->id.next) {
+ for (ScrArea *area = screen->areabase.first; area; area
= area->next) {
+ for (SpaceLink *slink = area->spacedata.first;
slink; slink = slink->next) {
+ if (slink->spacetype == SPACE_USERPREF)
{
+ ARegion *navigation_region =
BKE_spacedata_find_region_type(slink, area, RGN_TYPE_NAV_BAR);
+
+ if (!navigation_region) {
+ ListBase *regionbase =
(slink == area->spacedata.first) ?
+
&area->regionbase : &slink->regionbase;
+
+ navigation_region =
MEM_callocN(sizeof(ARegion), "userpref navigation-region do_versions");
+
+ BLI_addhead(regionbase,
navigation_region); /* order matters, addhead not addtail! */
+
navigation_region->regiontype = RGN_TYPE_NAV_BAR;
+
navigation_region->alignment = RGN_ALIGN_LEFT;
+ }
+ }
+ }
+ }
+ }
+ }
+
{
/* Versioning code until next subversion bump goes here. */
+
+ if (!DNA_struct_elem_find(fd->filesdna, "View3DShading",
"float", "curvature_ridge_factor")) {
+ 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_VIEW3D) {
+ View3D *v3d = (View3D
*)sl;
+
v3d->shading.curvature_ridge_factor = 1.0f;
+
v3d->shading.curvature_valley_factor = 1.0f;
+ }
+ }
+ }
+ }
+ }
+
+ /* Rename OpenGL to Workbench. */
+ for (Scene *scene = bmain->scene.first; scene; scene =
scene->id.next) {
+ if (STREQ(scene->r.engine, "BLENDER_OPENGL")) {
+ STRNCPY(scene->r.engine,
RE_engine_id_BLENDER_WORKBENCH);
+ }
+ }
+
+ /* init Annotations onion skin */
+ if (!DNA_struct_elem_find(fd->filesdna, "bGPDlayer", "int",
"gstep")) {
+ for (bGPdata *gpd = bmain->gpencil.first; gpd; gpd =
gpd->id.next) {
+ for (bGPDlayer *gpl = gpd->layers.first; gpl;
gpl = gpl->next) {
+ ARRAY_SET_ITEMS(gpl->gcolor_prev,
0.302f, 0.851f, 0.302f);
+ ARRAY_SET_ITEMS(gpl->gcolor_next,
0.250f, 0.1f, 1.0f);
+ }
+ }
+ }
+
+ /* Move studio_light selection to lookdev_light. */
+ if (!DNA_struct_elem_find(fd->filesdna, "View3DShading",
"char", "lookdev_light[256]")) {
+ 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_VIEW3D) {
+ View3D *v3d = (View3D
*)sl;
+
memcpy(v3d->shading.lookdev_light, v3d->shading.studio_light, sizeof(char) *
256);
+ }
+ }
+ }
+ }
+ }
+
+ /* Change Solid mode shadow orientation. */
+ if (!DNA_struct_elem_find(fd->filesdna, "SceneDisplay",
"float", "shadow_focus")) {
+ for (Scene *scene = bmain->scene.first; scene; scene =
scene->id.next) {
+ float *dir = scene->display.light_direction;
+ SWAP(float, dir[2], dir[1]);
+ dir[2] = -dir[2];
+ dir[0] = -dir[0];
+ }
+ }
}
}
diff --cc source/tools
index 30d4611eacb,30d4611eacb..2278dd8d6ae
--- a/source/tools
+++ b/source/tools
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit 30d4611eacb1c5b27a5e9d2432cb12843054abc9
++Subproject commit 2278dd8d6aea4d56632dee37196a5e341ce99283
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
