Merge branch 'master' into temp-gpencil-drw-engine

 Conflicts:
	source/blender/draw/engines/gpencil/gpencil_engine.c

7 files changed, 14 insertions, 14 deletions

diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp
index a15c215d2e2..9d0d075cade 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -594,7 +594,7 @@ std::string AnimationExporter::collada_tangent_from_curve(
   const FCurve *fcu = curve.get_fcurve();
   int tangent = (semantic == COLLADASW::InputSemantic::IN_TANGENT) ? 0 : 2;
 
-  for (int i = 0; i < fcu->totvert; ++i) {
+  for (int i = 0; i < fcu->totvert; i++) {
     BezTriple &bezt = fcu->bezt[i];
 
     float sampled_time = bezt.vec[tangent][0];
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp
index 54177560eb5..79593f07383 100644
--- a/source/blender/collada/AnimationImporter.cpp
+++ b/source/blender/collada/AnimationImporter.cpp
@@ -733,7 +733,7 @@ void AnimationImporter::Assign_float_animations(const COLLADAFW::UniqueId &listi
            * Reason: old blender versions stored spot_size in radians (was a bug)
            */
           if (this->import_from_version == "" ||
-              BLI_natstrcmp(this->import_from_version.c_str(), "2.69.10") != -1) {
+              BLI_strcasecmp_natural(this->import_from_version.c_str(), "2.69.10") != -1) {
             fcurve_deg_to_rad(fcu);
           }
         }
diff --git a/source/blender/collada/BCAnimationCurve.cpp b/source/blender/collada/BCAnimationCurve.cpp
index b494c749fe3..bf32ec9148c 100644
--- a/source/blender/collada/BCAnimationCurve.cpp
+++ b/source/blender/collada/BCAnimationCurve.cpp
@@ -249,7 +249,7 @@ const int BCAnimationCurve::closest_index_below(const float sample_frame) const
   int lower_index = 0;
   int upper_index = 0;
 
-  for (int fcu_index = 0; fcu_index < fcurve->totvert; ++fcu_index) {
+  for (int fcu_index = 0; fcu_index < fcurve->totvert; fcu_index++) {
     upper_index = fcu_index;
 
     const int cframe = fcurve->bezt[fcu_index].vec[1][0];  // inacurate!
@@ -537,7 +537,7 @@ bool BCAnimationCurve::is_keyframe(int frame)
     return false;
   }
 
-  for (int i = 0; i < fcurve->totvert; ++i) {
+  for (int i = 0; i < fcurve->totvert; i++) {
     const int cframe = nearbyint(fcurve->bezt[i].vec[1][0]);
     if (cframe == frame) {
       return true;
diff --git a/source/blender/collada/BCAnimationSampler.cpp b/source/blender/collada/BCAnimationSampler.cpp
index 49d87f92fda..5262d0b3672 100644
--- a/source/blender/collada/BCAnimationSampler.cpp
+++ b/source/blender/collada/BCAnimationSampler.cpp
@@ -129,7 +129,7 @@ static void add_keyframes_from(bAction *action, BCFrameSet &frameset)
 void BCAnimationSampler::check_property_is_animated(
     BCAnimation &animation, float *ref, float *val, std::string data_path, int length)
 {
-  for (int array_index = 0; array_index < length; ++array_index) {
+  for (int array_index = 0; array_index < length; array_index++) {
     if (!bc_in_range(ref[length], val[length], 0.00001)) {
       BCCurveKey key(BC_ANIMATION_TYPE_OBJECT, data_path, array_index);
       BCAnimationCurveMap::iterator it = animation.curve_map.find(key);
@@ -195,7 +195,7 @@ void BCAnimationSampler::sample_scene(BCExportSettings &export_settings, bool ke
   int startframe = scene->r.sfra;
   int endframe = scene->r.efra;
 
-  for (int frame_index = startframe; frame_index <= endframe; ++frame_index) {
+  for (int frame_index = startframe; frame_index <= endframe; frame_index++) {
     /* Loop over all frames and decide for each frame if sampling is necessary */
     bool is_scene_sample_frame = false;
     bool needs_update = true;
diff --git a/source/blender/collada/BlenderContext.cpp b/source/blender/collada/BlenderContext.cpp
index 709f84c3f77..8735d71ec40 100644
--- a/source/blender/collada/BlenderContext.cpp
+++ b/source/blender/collada/BlenderContext.cpp
@@ -121,7 +121,7 @@ bContext *BlenderContext::get_context()
 Depsgraph *BlenderContext::get_depsgraph()
 {
   if (!depsgraph) {
-    depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true);
+    depsgraph = BKE_scene_get_depsgraph(main, scene, view_layer, true);
   }
   return depsgraph;
 }
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index 98b166716c3..9d838406101 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -333,7 +333,7 @@ std::string DocumentImporter::get_import_version(const COLLADAFW::FileInfo *asse
   const char AUTORING_TOOL[] = "authoring_tool";
   const std::string BLENDER("Blender ");
   const COLLADAFW::FileInfo::ValuePairPointerArray &valuePairs = asset->getValuePairArray();
-  for (size_t i = 0, count = valuePairs.getCount(); i < count; ++i) {
+  for (size_t i = 0, count = valuePairs.getCount(); i < count; i++) {
     const COLLADAFW::FileInfo::ValuePair *valuePair = valuePairs[i];
     const COLLADAFW::String &key = valuePair->first;
     const COLLADAFW::String &value = valuePair->second;
@@ -567,7 +567,7 @@ std::vector<Object *> *DocumentImporter::write_node(COLLADAFW::Node *node,
           root_objects->push_back(ob);
         }
       }
-      ++geom_done;
+      geom_done++;
     }
     while (camera_done < camera.getCount()) {
       ob = create_camera_object(camera[camera_done], sce);
@@ -580,7 +580,7 @@ std::vector<Object *> *DocumentImporter::write_node(COLLADAFW::Node *node,
           root_objects->push_back(ob);
         }
       }
-      ++camera_done;
+      camera_done++;
     }
     while (lamp_done < lamp.getCount()) {
       ob = create_light_object(lamp[lamp_done], sce);
@@ -593,7 +593,7 @@ std::vector<Object *> *DocumentImporter::write_node(COLLADAFW::Node *node,
           root_objects->push_back(ob);
         }
       }
-      ++lamp_done;
+      lamp_done++;
     }
     while (controller_done < controller.getCount()) {
       COLLADAFW::InstanceGeometry *geometry = (COLLADAFW::InstanceGeometry *)
@@ -608,7 +608,7 @@ std::vector<Object *> *DocumentImporter::write_node(COLLADAFW::Node *node,
           root_objects->push_back(ob);
         }
       }
-      ++controller_done;
+      controller_done++;
     }
     /* XXX instance_node is not supported yet */
     while (inst_done < inst_node.getCount()) {
@@ -635,7 +635,7 @@ std::vector<Object *> *DocumentImporter::write_node(COLLADAFW::Node *node,
           }
         }
       }
-      ++inst_done;
+      inst_done++;
 
       read_transform = false;
     }
diff --git a/source/blender/collada/SceneExporter.cpp b/source/blender/collada/SceneExporter.cpp
index 01854bef328..24449de0ddd 100644
--- a/source/blender/collada/SceneExporter.cpp
+++ b/source/blender/collada/SceneExporter.cpp
@@ -88,7 +88,7 @@ void SceneExporter::writeNodeList(std::vector<Object *> &child_objects, Object *
    * I really prefer to enforce the export of hidden
    * elements in an object hierarchy. When the children of
    * the hidden elements are exported as well. */
-  for (int i = 0; i < child_objects.size(); ++i) {
+  for (int i = 0; i < child_objects.size(); i++) {
     Object *child = child_objects[i];
     writeNode(child);
     if (bc_is_marked(child)) {