[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52790] trunk/blender: bpy.ops module/ caller classes incorrectly had __keys__ rather then __slots__.

Campbell Barton ideasman42 at gmail.com
Thu Dec 6 04:09:12 CET 2012


Revision: 52790
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52790
Author:   campbellbarton
Date:     2012-12-06 03:09:06 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
bpy.ops module/caller classes incorrectly had __keys__ rather then __slots__.
also added comments about texface drawing when theres no origindex.

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bpy/ops.py
    trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c

Modified: trunk/blender/release/scripts/modules/bpy/ops.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/ops.py	2012-12-06 02:42:42 UTC (rev 52789)
+++ trunk/blender/release/scripts/modules/bpy/ops.py	2012-12-06 03:09:06 UTC (rev 52790)
@@ -74,7 +74,7 @@
 
     eg. bpy.ops.object
     """
-    __keys__ = ("module",)
+    __slots__ = ("module",)
 
     def __init__(self, module):
         self.module = module
@@ -111,7 +111,7 @@
     eg. bpy.ops.object.somefunc
     """
 
-    __keys__ = ("module", "func")
+    __slots__ = ("module", "func")
 
     def _get_doc(self):
         return op_as_string(self.idname())

Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-12-06 02:42:42 UTC (rev 52789)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2012-12-06 03:09:06 UTC (rev 52790)
@@ -654,6 +654,9 @@
 				if (index_mf_to_mpoly) {
 					orig = DM_origindex_mface_mpoly(index_mf_to_mpoly, index_mp_to_orig, i);
 					if (orig == ORIGINDEX_NONE) {
+						/* XXX, this is not really correct
+						 * it will draw the previous faces context for this one when we don't know its settings.
+						 * but better then skipping it altogether. - campbell */
 						draw_option = DM_DRAW_OPTION_NORMAL;
 					}
 					else if (drawParamsMapped) {
@@ -756,6 +759,9 @@
 					if (index_mf_to_mpoly) {
 						orig = DM_origindex_mface_mpoly(index_mf_to_mpoly, index_mp_to_orig, actualFace);
 						if (orig == ORIGINDEX_NONE) {
+							/* XXX, this is not really correct
+							 * it will draw the previous faces context for this one when we don't know its settings.
+							 * but better then skipping it altogether. - campbell */
 							draw_option = DM_DRAW_OPTION_NORMAL;
 						}
 						else if (drawParamsMapped) {




More information about the Bf-blender-cvs mailing list