Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 22 Sep 2017 08:26:49 +0000 (13:26 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 22 Sep 2017 08:26:49 +0000 (13:26 +0500)
1  2 
build_files/build_environment/install_deps.sh
intern/cycles/blender/blender_mesh.cpp
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/mask.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/collada/DocumentExporter.cpp
source/blender/editors/curve/editfont.c
source/blender/editors/interface/interface_regions.c
source/blender/editors/space_action/space_action.c
source/creator/CMakeLists.txt

@@@ -285,10 -290,10 +285,10 @@@ SUDO="sudo
  
  NO_BUILD=false
  NO_CONFIRM=false
 -USE_CXX11=false
 +USE_CXX11=true  # Mandatory in blender2.8
  
- PYTHON_VERSION="3.5.3"
- PYTHON_VERSION_MIN="3.5"
+ PYTHON_VERSION="3.6.2"
+ PYTHON_VERSION_MIN="3.6"
  PYTHON_FORCE_BUILD=false
  PYTHON_FORCE_REBUILD=false
  PYTHON_SKIP=false
@@@ -61,6 -62,6 +61,8 @@@
  #include "BKE_movieclip.h"
  #include "BKE_image.h"
  
++#include "DEG_depsgraph_build.h"
++
  static struct {
        ListBase splines;
        struct GHash *id_hash;
@@@ -817,6 -818,8 +819,8 @@@ Mask *BKE_mask_new(Main *bmain, const c
        mask->sfra = 1;
        mask->efra = 100;
  
 -      DAG_relations_tag_update(bmain);
++      DEG_relations_tag_update(bmain);
        return mask;
  }
  
@@@ -315,8 -320,10 +318,10 @@@ int DocumentExporter::exportCurrentScen
        else {
                se.setExportTransformationType(this->export_settings->export_transformation_type);
        }
+ #else
+       se.setExportTransformationType(this->export_settings->export_transformation_type);
+ #endif
 -      se.exportScene(sce);
 +      se.exportScene(eval_ctx, sce);
        
        // <scene>
        std::string scene_name(translate_id(id_name(sce)));
Simple merge