diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-03-21 18:16:55 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-21 18:16:55 +0400 |
commit | dad7afa1afaa7433bd7ee3b62a788fa19a6d2cd3 (patch) | |
tree | 3e133961e419009149f73718d009f8a893bbb4e4 /source/blender/editors | |
parent | 401fdf5065bf8180833cf789ac4e5bfbc6ce1a8c (diff) |
code cleanup: remove double call to BKE_node_instance_key(), rename ruler (lots of tools are 3d :)), and redundant assignment.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/space_node/node_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_ruler.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 1194cf8559f..5723e4d34fb 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -1161,7 +1161,7 @@ void node_draw_nodetree(const bContext *C, ARegion *ar, SpaceNode *snode, bNodeT /* draw foreground nodes, last nodes in front */ for (a = 0, node = ntree->nodes.first; node; node = node->next, a++) { - bNodeInstanceKey key = BKE_node_instance_key(parent_key, ntree, node); + bNodeInstanceKey key; if (node->flag & NODE_BACKGROUND) continue; diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c index 410d20a1dc0..d6cc218e266 100644 --- a/source/blender/editors/space_view3d/view3d_ruler.c +++ b/source/blender/editors/space_view3d/view3d_ruler.c @@ -924,7 +924,7 @@ static int view3d_ruler_modal(bContext *C, wmOperator *op, const wmEvent *event) void VIEW3D_OT_ruler(wmOperatorType *ot) { /* identifiers */ - ot->name = "3D Ruler & Protractor"; + ot->name = "Ruler/Protractor"; ot->description = "Interactive ruler"; ot->idname = "VIEW3D_OT_ruler"; |