Merge branch 'blender-v2.83-release'

release/scripts/modules/bpy/utils/previews.py

@@ -94,7 +94,7 @@ class ImagePreviewCollection(dict):
 
     def load(self, name, path, path_type, force_reload=False):
         if name in self:
-            raise KeyError("key {name!r} already exists")
+            raise KeyError(f"key {name!r} already exists")
         p = self[name] = _utils_previews.load(
             self._gen_key(name), path, path_type, force_reload)
         return p

source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h

@@ -22,6 +22,7 @@
  * \brief Iterators used to iterate over the elements of the Curve. Can't be used in python
  */
 
+#include "CurveIterators.h"
 #include "Stroke.h"
 
 namespace Freestyle {

source/blender/freestyle/intern/stroke/StrokeAdvancedIterators.h

@@ -23,6 +23,7 @@
  */
 
 #include "Stroke.h"
+#include "StrokeIterators.h"
 
 namespace Freestyle {
 

source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h

@@ -24,6 +24,7 @@
  */
 
 #include "ViewMap.h"
+#include "ViewMapIterators.h"
 
 #include "../system/Iterator.h"  //soc