Commit: 1f46da922a98c6badf6e2de13304358b3b0b7576
Author: Bastien Montagne
Date: Fri May 19 09:36:14 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB1f46da922a98c6badf6e2de13304358b3b0b7576
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/depsgraph/intern/depsgraph_tag.cc
source/blender/editors/mask/mask_draw.c
===================================================================
===================================================================
diff --cc build_files/build_environment/install_deps.sh
index dd1e7622be1,b996c234c67..95cb82ee6ec
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@@ -282,9 -287,9 +282,9 @@@ SUDO="sudo
NO_BUILD=false
NO_CONFIRM=false
-USE_CXX11=false
+USE_CXX11=true # Mandatory in blender2.8
- PYTHON_VERSION="3.5.2"
+ PYTHON_VERSION="3.5.3"
PYTHON_VERSION_MIN="3.5"
PYTHON_FORCE_BUILD=false
PYTHON_FORCE_REBUILD=false
diff --cc source/blender/blenloader/intern/versioning_270.c
index a097e0a9e48,d3260db1477..d8f1da3b6b4
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1636,26 -1636,11 +1636,32 @@@ void blo_do_versions_270(FileData *fd,
}
{
+ for (Scene *scene = main->scene.first; scene; scene =
scene->id.next) {
+ if (scene->r.im_format.exr_codec ==
R_IMF_EXR_CODEC_DWAB) {
+ scene->r.im_format.exr_codec =
R_IMF_EXR_CODEC_DWAA;
+ }
+ }
++
+ if (!DNA_struct_elem_find(fd->filesdna, "View3DDebug", "char",
"background")) {
+ bScreen *screen;
+
+ for (screen = main->screen.first; screen; screen =
screen->id.next) {
+ ScrArea *sa;
+ for (sa = screen->areabase.first; sa; sa =
sa->next) {
+ SpaceLink *sl;
+
+ for (sl = sa->spacedata.first; sl; sl =
sl->next) {
+ switch (sl->spacetype) {
+ case SPACE_VIEW3D:
+ {
+ View3D *v3d =
(View3D *)sl;
+
v3d->debug.background = V3D_DEBUG_BACKGROUND_NONE;
+ }
+ }
+ }
+ }
+ }
+ }
}
}
diff --cc source/blender/editors/mask/mask_draw.c
index 228a4db74e1,be7eb2bf9ed..b3e6a369d90
--- a/source/blender/editors/mask/mask_draw.c
+++ b/source/blender/editors/mask/mask_draw.c
@@@ -783,14 -833,13 +783,13 @@@ void ED_mask_draw_region(Mask *mask, AR
}
/* apply transformation so mask editing tools will assume drawing from
the origin in normalized space */
- glPushMatrix();
- glTranslatef(x + xofs, y + yofs, 0);
- glScalef(zoomx, zoomy, 0);
+ gpuPushMatrix();
-
++ gpuTranslate2f(x + xofs, y + yofs);
++ gpuScale2f(zoomx, zoomy);
if (stabmat) {
- glMultMatrixf(stabmat);
+ gpuMultMatrix(stabmat);
}
-
- gpuTranslate2f(x + xofs, y + yofs);
- gpuScale2f(maxdim * zoomx, maxdim * zoomy);
- glScalef(maxdim, maxdim, 0);
++ gpuScale2f(maxdim, maxdim);
if (do_draw_cb) {
ED_region_draw_cb_draw(C, ar, REGION_DRAW_PRE_VIEW);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
