[Bf-blender-cvs] [128c7c3ba1d] blender2.8: Merge branch 'master' into blender2.8
Sergey Sharybin
noreply at git.blender.org
Fri Sep 22 10:29:07 CEST 2017
Commit: 128c7c3ba1d15e08241ec3e90fa694cfb210d2b9
Author: Sergey Sharybin
Date: Fri Sep 22 13:26:49 2017 +0500
Branches: blender2.8
https://developer.blender.org/rB128c7c3ba1d15e08241ec3e90fa694cfb210d2b9
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc build_files/build_environment/install_deps.sh
index 28eaa70711c,73ac2595acb..c3d496f6dc3
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@@ -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
diff --cc source/blender/blenkernel/intern/mask.c
index aa8cfe1d36d,8b8b48db279..1e9447c4f09
--- a/source/blender/blenkernel/intern/mask.c
+++ b/source/blender/blenkernel/intern/mask.c
@@@ -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;
}
diff --cc source/blender/collada/DocumentExporter.cpp
index 24a09562a7b,dcfd062470c..88bc5c3c295
--- a/source/blender/collada/DocumentExporter.cpp
+++ b/source/blender/collada/DocumentExporter.cpp
@@@ -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)));
More information about the Bf-blender-cvs
mailing list