Merged changes in the trunk up to revision 54110.

Conflicts resolved:
source/blender/blenfont/SConscript
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_scene.c

doc/python_api/sphinx_doc_gen.py

@@ -614,10 +614,10 @@ def pyfunc2sphinx(ident, fw, identifier, py_func, is_class=True):
     '''
     function or class method to sphinx
     '''
-    
+
     if type(py_func) == type(bpy.types.Space.draw_handler_add):
         return
-    
+
     arg_str = inspect.formatargspec(*inspect.getargspec(py_func))
 
     if not is_class:
@@ -992,6 +992,7 @@ context_type_map = {
     "world": ("World", False),
 }
 
+
 def pycontext2sphinx(basepath):
     # Only use once. very irregular
 
@@ -1019,7 +1020,6 @@ def pycontext2sphinx(basepath):
         "sequencer_context_dir",
     )
 
-
     unique = set()
     blend_cdll = ctypes.CDLL("")
     for ctx_str in context_strings: