forked from bartvdbraak/blender
We're entering 2.71rc state now
Meaning we do subversion bump and hopefully only splash screen separates us from the final release. Unless some bad regression is being discovered..
This commit is contained in:
parent
9f0466fb6b
commit
9ef7486a38
@ -41,8 +41,8 @@ extern "C" {
|
||||
/* these lines are grep'd, watch out for our not-so-awesome regex
|
||||
* and keep comment above the defines.
|
||||
* Use STRINGIFY() rather than defining with quotes */
|
||||
#define BLENDER_VERSION 270
|
||||
#define BLENDER_SUBVERSION 5
|
||||
#define BLENDER_VERSION 271
|
||||
#define BLENDER_SUBVERSION 0
|
||||
/* 262 was the last editmesh release but it has compatibility code for bmesh data */
|
||||
#define BLENDER_MINVERSION 270
|
||||
#define BLENDER_MINSUBVERSION 5
|
||||
@ -51,7 +51,7 @@ extern "C" {
|
||||
/* can be left blank, otherwise a,b,c... etc with no quotes */
|
||||
#define BLENDER_VERSION_CHAR
|
||||
/* alpha/beta/rc/release, docs use this */
|
||||
#define BLENDER_VERSION_CYCLE alpha
|
||||
#define BLENDER_VERSION_CYCLE rc
|
||||
|
||||
extern char versionstr[]; /* from blender.c */
|
||||
|
||||
|
@ -251,49 +251,51 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main)
|
||||
}
|
||||
}
|
||||
|
||||
if (!DNA_struct_elem_find(fd->filesdna, "Material", "int", "mode2")) {
|
||||
Material *ma;
|
||||
if (!MAIN_VERSION_ATLEAST(main, 271, 0)) {
|
||||
if (!DNA_struct_elem_find(fd->filesdna, "Material", "int", "mode2")) {
|
||||
Material *ma;
|
||||
|
||||
for (ma = main->mat.first; ma; ma = ma->id.next)
|
||||
ma->mode2 = MA_CASTSHADOW;
|
||||
}
|
||||
|
||||
if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "BakeData", "bake")) {
|
||||
Scene *sce;
|
||||
|
||||
for (sce = main->scene.first; sce; sce = sce->id.next) {
|
||||
sce->r.bake.flag = R_BAKE_CLEAR;
|
||||
sce->r.bake.width = 512;
|
||||
sce->r.bake.height = 512;
|
||||
sce->r.bake.margin = 16;
|
||||
sce->r.bake.normal_space = R_BAKE_SPACE_TANGENT;
|
||||
sce->r.bake.normal_swizzle[0] = R_BAKE_POSX;
|
||||
sce->r.bake.normal_swizzle[1] = R_BAKE_POSY;
|
||||
sce->r.bake.normal_swizzle[2] = R_BAKE_POSZ;
|
||||
BLI_strncpy(sce->r.bake.filepath, U.renderdir, sizeof(sce->r.bake.filepath));
|
||||
|
||||
sce->r.bake.im_format.planes = R_IMF_PLANES_RGBA;
|
||||
sce->r.bake.im_format.imtype = R_IMF_IMTYPE_PNG;
|
||||
sce->r.bake.im_format.depth = R_IMF_CHAN_DEPTH_8;
|
||||
sce->r.bake.im_format.quality = 90;
|
||||
sce->r.bake.im_format.compress = 15;
|
||||
for (ma = main->mat.first; ma; ma = ma->id.next)
|
||||
ma->mode2 = MA_CASTSHADOW;
|
||||
}
|
||||
}
|
||||
|
||||
if (!DNA_struct_elem_find(fd->filesdna, "FreestyleLineStyle", "float", "texstep")) {
|
||||
FreestyleLineStyle *linestyle;
|
||||
if (!DNA_struct_elem_find(fd->filesdna, "RenderData", "BakeData", "bake")) {
|
||||
Scene *sce;
|
||||
|
||||
for (linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
|
||||
linestyle->flag |= LS_TEXTURE;
|
||||
linestyle->texstep = 1.0;
|
||||
for (sce = main->scene.first; sce; sce = sce->id.next) {
|
||||
sce->r.bake.flag = R_BAKE_CLEAR;
|
||||
sce->r.bake.width = 512;
|
||||
sce->r.bake.height = 512;
|
||||
sce->r.bake.margin = 16;
|
||||
sce->r.bake.normal_space = R_BAKE_SPACE_TANGENT;
|
||||
sce->r.bake.normal_swizzle[0] = R_BAKE_POSX;
|
||||
sce->r.bake.normal_swizzle[1] = R_BAKE_POSY;
|
||||
sce->r.bake.normal_swizzle[2] = R_BAKE_POSZ;
|
||||
BLI_strncpy(sce->r.bake.filepath, U.renderdir, sizeof(sce->r.bake.filepath));
|
||||
|
||||
sce->r.bake.im_format.planes = R_IMF_PLANES_RGBA;
|
||||
sce->r.bake.im_format.imtype = R_IMF_IMTYPE_PNG;
|
||||
sce->r.bake.im_format.depth = R_IMF_CHAN_DEPTH_8;
|
||||
sce->r.bake.im_format.quality = 90;
|
||||
sce->r.bake.im_format.compress = 15;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
Scene *scene;
|
||||
for (scene = main->scene.first; scene; scene = scene->id.next) {
|
||||
int num_layers = BLI_countlist(&scene->r.layers);
|
||||
scene->r.actlay = min_ff(scene->r.actlay, num_layers - 1);
|
||||
if (!DNA_struct_elem_find(fd->filesdna, "FreestyleLineStyle", "float", "texstep")) {
|
||||
FreestyleLineStyle *linestyle;
|
||||
|
||||
for (linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
|
||||
linestyle->flag |= LS_TEXTURE;
|
||||
linestyle->texstep = 1.0;
|
||||
}
|
||||
}
|
||||
|
||||
{
|
||||
Scene *scene;
|
||||
for (scene = main->scene.first; scene; scene = scene->id.next) {
|
||||
int num_layers = BLI_countlist(&scene->r.layers);
|
||||
scene->r.actlay = min_ff(scene->r.actlay, num_layers - 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user