Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-06-08 13:36:17 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-06-08 13:36:17 +0400
commit26f9fe39628c16e2740ac85f4d21e7d0ee6f3d09 (patch)
tree7cc222d4194ab484000651bac01fb5aa7aa5d34e /source/blender/editors/space_node
parent93870181225bb303ee725a22863323a60f3711c6 (diff)
parentae3062b741f3951048df8b26e09ce61354c5248d (diff)
Merging r47581 through r47603 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/editors/space_node')
-rw-r--r--source/blender/editors/space_node/drawnode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index b75b3e6aeb3..1a6ec2813fa 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -2294,7 +2294,7 @@ static void node_composit_buts_bokehimage(uiLayout *layout, bContext *UNUSED(C),
void node_composit_backdrop_viewer(SpaceNode *snode, ImBuf *backdrop, bNode *node, int x, int y)
{
// node_composit_backdrop_canvas(snode, backdrop, node, x, y);
- if (node->custom1 == 0) { /// @todo: why did we need this one?
+ if (node->custom1 == 0) {
const float backdropWidth = backdrop->x;
const float backdropHeight = backdrop->y;
const float cx = x + snode->zoom * backdropWidth * node->custom3;