diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-10-12 07:24:47 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-10-12 07:24:47 +0400 |
| commit | f97dfdf227d1fa324a9c41bb83e53b5a46578a4d (patch) | |
| tree | bb5f0eb5cb59f68e0488ebadef94806481c46056 | |
| parent | 40186a8c1166284c27c05dd86560ada8625652ea (diff) | |
quiet clang static checker warning by returning an error for invalid situation getting an IDProp mapping from a PyObject.
also print the path installed to when installing an addon.
| -rw-r--r-- | release/scripts/startup/bl_operators/wm.py | 7 | ||||
| -rw-r--r-- | source/blender/python/generic/idprop_py_api.c | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index af33f80bdf8..21cd2b47f71 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -1822,8 +1822,11 @@ class WM_OT_addon_install(Operator): # in case a new module path was created to install this addon. bpy.utils.refresh_script_paths() - # TODO, should not be a warning. - #~ self.report({'WARNING'}, "File installed to '%s'\n" % path_dest) + # print message + msg = "File %r installed into %r\n" % (pyfile, path_dest) + self.report({'INFO'}, msg) + print(msg) + return {'FINISHED'} def invoke(self, context, event): diff --git a/source/blender/python/generic/idprop_py_api.c b/source/blender/python/generic/idprop_py_api.c index 06b6192a091..23af0683d18 100644 --- a/source/blender/python/generic/idprop_py_api.c +++ b/source/blender/python/generic/idprop_py_api.c @@ -427,6 +427,8 @@ const char *BPy_IDProperty_Map_ValidateAndCreate(PyObject *name_obj, IDProperty return error; } break; + default: + return "internal error with idp array.type"; } } else if (PyMapping_Check(ob)) { @@ -471,7 +473,7 @@ const char *BPy_IDProperty_Map_ValidateAndCreate(PyObject *name_obj, IDProperty if (group->type == IDP_IDPARRAY) { IDP_AppendArray(group, prop); - // IDP_FreeProperty(item); // IDP_AppendArray does a shallow copy (memcpy), only free memory + // IDP_FreeProperty(item); /* IDP_AppendArray does a shallow copy (memcpy), only free memory */ MEM_freeN(prop); } else { |