[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [1589] trunk/py/scripts/addons/modules/ extensions_framework/__init__.py: extensions_framework: remove addon_register_class from init_functions return; can use @ AddonInstance.addon_register_class directly

Doug Hammond doughammond at hamsterfight.co.uk
Sat Feb 12 19:48:37 CET 2011


Revision: 1589
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=1589
Author:   dougal2
Date:     2011-02-12 18:48:36 +0000 (Sat, 12 Feb 2011)
Log Message:
-----------
extensions_framework: remove addon_register_class from init_functions return; can use @AddonInstance.addon_register_class directly

Modified Paths:
--------------
    trunk/py/scripts/addons/modules/extensions_framework/__init__.py

Modified: trunk/py/scripts/addons/modules/extensions_framework/__init__.py
===================================================================
--- trunk/py/scripts/addons/modules/extensions_framework/__init__.py	2011-02-12 18:31:47 UTC (rev 1588)
+++ trunk/py/scripts/addons/modules/extensions_framework/__init__.py	2011-02-12 18:48:36 UTC (rev 1589)
@@ -279,20 +279,24 @@
 	addon_classes = None
 	bl_info = None
 	
+	BL_VERSION = None
+	BL_IDNAME = None
+	
 	def __init__(self, bl_info=None):
 		self.addon_classes = []
 		self.bl_info = bl_info
+		
+		# Keep a count in case we have to give this addon an anonymous name
 		self.addon_serial = Addon.static_addon_count
+		Addon.static_addon_count += 1
 		
-		Addon.static_addon_count += 1
-	
-	def bl_infos(self):
 		if self.bl_info:
-			BL_VERSION = '.'.join(['%s'%v for v in self.bl_info['version']]).lower()
-			BL_IDNAME = self.bl_info['name'].lower() + '-' + BL_VERSION
-			return BL_VERSION, BL_IDNAME
+			self.BL_VERSION = '.'.join(['%s'%v for v in self.bl_info['version']]).lower()
+			self.BL_IDNAME = self.bl_info['name'].lower() + '-' + self.BL_VERSION
 		else:
-			return '0', 'Addon-%03d'%self.addon_serial
+			# construct anonymous name
+			self.BL_VERSION = '0'
+			self.BL_IDNAME = 'Addon-%03d'%self.addon_serial
 	
 	def addon_register_class(self, cls):
 		"""This method is designed to be used as a decorator on RNA-registerable
@@ -331,4 +335,4 @@
 		
 		"""
 		
-		return self.addon_register_class, self.register, self.unregister
+		return self.register, self.unregister



More information about the Bf-extensions-cvs mailing list