Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Fri, 19 May 2017 07:36:14 +0000 (09:36 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Fri, 19 May 2017 07:36:14 +0000 (09:36 +0200)
Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/depsgraph/intern/depsgraph_tag.cc
source/blender/editors/mask/mask_draw.c

1  2 
build_files/build_environment/install_deps.sh
intern/cycles/device/device_cuda.cpp
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/mask/mask_draw.c
source/blender/editors/space_image/image_ops.c
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/envmap.c

index dd1e7622be138a1e525bab6b5020b793833ba00f,b996c234c67a190458594c2847afc2684898a049..95cb82ee6ec1aa8d9d90f0477937dd90a4d6c704
@@@ -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
Simple merge
index a097e0a9e48f56ca716f9436692fc064ce5eecb6,d3260db1477e4c82b723aa91510194060c8d7e4c..d8f1da3b6b489dbc2f3aae0a1c5125901a9fd096
@@@ -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;
 +                                                      }
 +                                              }
 +                                      }
 +                              }
 +                      }
 +              }
        }
  }
  
index 228a4db74e16092db8d8b964fcd16885d21ff5f4,be7eb2bf9edd2d7886ffa4afaafd2204ab1caccd..b3e6a369d905bf75942680fba41d3c25ff3d5f51
@@@ -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);