[Bf-blender-cvs] [27231afce5e] master: Cleanup: remove checks for invalid input for Python Run utilities

Campbell Barton noreply at git.blender.org
Mon Dec 13 06:22:59 CET 2021


Commit: 27231afce5e4d0832113415f4d3cdeed480b165f
Author: Campbell Barton
Date:   Mon Dec 13 16:22:18 2021 +1100
Branches: master
https://developer.blender.org/rB27231afce5e4d0832113415f4d3cdeed480b165f

Cleanup: remove checks for invalid input for Python Run utilities

These arguments must be non-null for useful functionality,
there is no need for paranoid checks.

The return value in case of invalid input for BPY_run_string_as_number
was also wrong (casting -1 to a bool, when false was expected).

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

M	source/blender/python/intern/bpy_interface_run.c

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

diff --git a/source/blender/python/intern/bpy_interface_run.c b/source/blender/python/intern/bpy_interface_run.c
index a4d54a4ce83..bc21c91074f 100644
--- a/source/blender/python/intern/bpy_interface_run.c
+++ b/source/blender/python/intern/bpy_interface_run.c
@@ -340,10 +340,6 @@ bool BPY_run_string_as_number(bContext *C,
   PyGILState_STATE gilstate;
   bool ok = true;
 
-  if (!r_value || !expr) {
-    return -1;
-  }
-
   if (expr[0] == '\0') {
     *r_value = 0.0;
     return ok;
@@ -369,7 +365,6 @@ bool BPY_run_string_as_string_and_size(bContext *C,
                                        char **r_value,
                                        size_t *r_value_size)
 {
-  BLI_assert(r_value && expr);
   PyGILState_STATE gilstate;
   bool ok = true;
 
@@ -407,7 +402,6 @@ bool BPY_run_string_as_intptr(bContext *C,
                               struct BPy_RunErrInfo *err_info,
                               intptr_t *r_value)
 {
-  BLI_assert(r_value && expr);
   PyGILState_STATE gilstate;
   bool ok = true;



More information about the Bf-blender-cvs mailing list