[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51280] trunk/blender: quiet clang static checker warning by returning an error for invalid situation getting an IDProp mapping from a PyObject .

Campbell Barton ideasman42 at gmail.com
Fri Oct 12 05:24:47 CEST 2012


Revision: 51280
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51280
Author:   campbellbarton
Date:     2012-10-12 03:24:47 +0000 (Fri, 12 Oct 2012)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/release/scripts/startup/bl_operators/wm.py
    trunk/blender/source/blender/python/generic/idprop_py_api.c

Modified: trunk/blender/release/scripts/startup/bl_operators/wm.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/wm.py	2012-10-12 00:18:32 UTC (rev 51279)
+++ trunk/blender/release/scripts/startup/bl_operators/wm.py	2012-10-12 03:24:47 UTC (rev 51280)
@@ -1822,8 +1822,11 @@
         # 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):

Modified: trunk/blender/source/blender/python/generic/idprop_py_api.c
===================================================================
--- trunk/blender/source/blender/python/generic/idprop_py_api.c	2012-10-12 00:18:32 UTC (rev 51279)
+++ trunk/blender/source/blender/python/generic/idprop_py_api.c	2012-10-12 03:24:47 UTC (rev 51280)
@@ -427,6 +427,8 @@
 						return error;
 				}
 				break;
+			default:
+				return "internal error with idp array.type";
 		}
 	}
 	else if (PyMapping_Check(ob)) {
@@ -471,7 +473,7 @@
 
 	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 {




More information about the Bf-blender-cvs mailing list