Commit: 78aa9be2ee993c68189d65aee68c12e423e4d21a
Author: Antony Riakiotakis
Date: Thu Feb 12 16:19:35 2015 +0100
Branches: viewport_experiments
https://developer.blender.org/rB78aa9be2ee993c68189d65aee68c12e423e4d21a
Merge branch 'master' into viewport_master_merge
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index 2e5ab7f,572566d..321ee54
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -561,15 -562,33 +563,43 @@@ void blo_do_versions_270(FileData *fd,
}
FOREACH_NODETREE_END
}
+
+ if (!DNA_struct_elem_find(fd->filesdna, "Camera",
"GPUDOFOptions", "gpu_dof")) {
+ Camera *ca;
+ for (ca = main->camera.first; ca; ca = ca->id.next) {
+ ca->gpu_dof.fstop = 128.0f;
+ ca->gpu_dof.focal_length = 1.0f;
+ ca->gpu_dof.focus_distance = 1.0f;
+ ca->gpu_dof.sensor = 1.0f;
+ }
+ }
}
+
+ if (!MAIN_VERSION_ATLEAST(main, 273, 7)) {
+ bScreen *scr;
+ ScrArea *sa;
+ SpaceLink *sl;
+ ARegion *ar;
+
+ for (scr = main->screen.first; scr; scr = scr->id.next) {
+ /* Remove old deprecated region from filebrowsers */
+ for (sa = scr->areabase.first; sa; sa = sa->next) {
+ for (sl = sa->spacedata.first; sl; sl =
sl->next) {
+ if (sl->spacetype == SPACE_FILE) {
+ for (ar = sl->regionbase.first;
ar; ar = ar->next) {
+ if (ar->regiontype ==
RGN_TYPE_CHANNELS) {
+ break;
+ }
+ }
+
+ if (ar) {
+ /* Free old deprecated
'channel' region... */
+
BKE_area_region_free(NULL, ar);
+
BLI_freelinkN(&sl->regionbase, ar);
+ }
+ }
+ }
+ }
+ }
+ }
}
diff --cc source/blender/makesdna/DNA_scene_types.h
index 9992f5c,2d2ee4a..c20f5ff
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -46,8 -46,8 +46,9 @@@ extern "C"
#include "DNA_listBase.h"
#include "DNA_ID.h"
#include "DNA_freestyle_types.h"
+#include "DNA_gpu_types.h"
+ struct CurveMapping;
struct Object;
struct Brush;
struct World;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
