[Bf-blender-cvs] [2defd81b5e2] master: Cleanup: comments

Campbell Barton noreply at git.blender.org
Wed Nov 20 08:13:39 CET 2019


Commit: 2defd81b5e2ceca47d7b62ef5062c05ea9206e59
Author: Campbell Barton
Date:   Wed Nov 20 18:10:33 2019 +1100
Branches: master
https://developer.blender.org/rB2defd81b5e2ceca47d7b62ef5062c05ea9206e59

Cleanup: comments

===================================================================

M	source/blender/blenlib/intern/task.c
M	source/blender/python/intern/bpy_interface.c
M	source/blender/python/intern/bpy_rna.c

===================================================================

diff --git a/source/blender/blenlib/intern/task.c b/source/blender/blenlib/intern/task.c
index bb69dc6452f..0613b558aec 100644
--- a/source/blender/blenlib/intern/task.c
+++ b/source/blender/blenlib/intern/task.c
@@ -1467,7 +1467,7 @@ static void task_parallel_iterator_do(const TaskParallelSettings *settings,
  * \param init_item: The initial item, if necessary (may be NULL if unused).
  * \param init_index: The initial index.
  * \param tot_items: The total amount of items to iterate over
- *                   (if unkown, set it to a negative number).
+ *                   (if unknown, set it to a negative number).
  * \param func: Callback function.
  * \param settings: See public API doc of TaskParallelSettings for description of all settings.
  *
diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c
index a73e4034ca6..a69ce068aec 100644
--- a/source/blender/python/intern/bpy_interface.c
+++ b/source/blender/python/intern/bpy_interface.c
@@ -262,16 +262,8 @@ void BPY_python_start(int argc, const char **argv)
    * blender is utf-8 too - campbell */
   Py_SetStandardStreamEncoding("utf-8", "surrogateescape");
 
-  /* Update, Py3.3 resolves attempting to parse non-existing header */
-#  if 0
-  /* Python 3.2 now looks for '2.xx/python/include/python3.2d/pyconfig.h' to
-   * parse from the 'sysconfig' module which is used by 'site',
-   * so for now disable site. alternatively we could copy the file. */
-  if (py_path_bundle) {
-    Py_NoSiteFlag = 1;
-  }
-#  endif
-
+  /* Suppress error messages when calculating the module search path.
+   * While harmless, it's noisy. */
   Py_FrozenFlag = 1;
 
   Py_Initialize();
diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c
index 6bc7676973c..4c14f8ca8d3 100644
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -8684,7 +8684,8 @@ static PyObject *pyrna_register_class(PyObject *UNUSED(self), PyObject *py_class
     return NULL;
   }
 
-  /* Call classed register method. */
+  /* Call classed register method.
+   * Note that zero falls through, no attribute, no error. */
   switch (_PyObject_LookupAttr(py_class, bpy_intern_str_register, &py_cls_meth)) {
     case 1: {
       PyObject *ret = PyObject_CallObject(py_cls_meth, NULL);
@@ -8791,7 +8792,8 @@ static PyObject *pyrna_unregister_class(PyObject *UNUSED(self), PyObject *py_cla
     return NULL;
   }
 
-  /* Call classed unregister method. */
+  /* Call classed unregister method.
+   * Note that zero falls through, no attribute, no error. */
   switch (_PyObject_LookupAttr(py_class, bpy_intern_str_unregister, &py_cls_meth)) {
     case 1: {
       PyObject *ret = PyObject_CallObject(py_cls_meth, NULL);



More information about the Bf-blender-cvs mailing list