diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-12-06 07:09:06 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-06 07:09:06 +0400 |
| commit | 7c2e4e28ba262199588ee234cbf991eed7983b0d (patch) | |
| tree | 2cb11006854ea084e87c9b3de33ef021a3fe7ac6 | |
| parent | a864259d5099d936e4b973d6469e033da1c72d49 (diff) | |
bpy.ops module/caller classes incorrectly had __keys__ rather then __slots__.
also added comments about texface drawing when theres no origindex.
| -rw-r--r-- | release/scripts/modules/bpy/ops.py | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/release/scripts/modules/bpy/ops.py b/release/scripts/modules/bpy/ops.py index 34beb6035ae..52bf1c04e65 100644 --- a/release/scripts/modules/bpy/ops.py +++ b/release/scripts/modules/bpy/ops.py @@ -74,7 +74,7 @@ class BPyOpsSubMod(object): eg. bpy.ops.object """ - __keys__ = ("module",) + __slots__ = ("module",) def __init__(self, module): self.module = module @@ -111,7 +111,7 @@ class BPyOpsSubModOp(object): eg. bpy.ops.object.somefunc """ - __keys__ = ("module", "func") + __slots__ = ("module", "func") def _get_doc(self): return op_as_string(self.idname()) diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 2fd922db888..54bbe4bf495 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -654,6 +654,9 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm, 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 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm, 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) { |