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:
authorCampbell Barton <ideasman42@gmail.com>2012-11-15 06:11:40 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-11-15 06:11:40 +0400
commit283ee53085b1e215cbd0d8af91b0000660406bfe (patch)
tree498c2640d15304d71268157af098f3f146f077b0 /source/blender/compositor
parentcd8584aad56eb7fcc94dc4ebfbcde034aebbe3cd (diff)
fix for deleting lines hanging the text editor when no markers are used, presence of markers still hangs.
also compiler warnings and some style edits.
Diffstat (limited to 'source/blender/compositor')
-rw-r--r--source/blender/compositor/operations/COM_MapRangeOperation.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/compositor/operations/COM_MapRangeOperation.cpp b/source/blender/compositor/operations/COM_MapRangeOperation.cpp
index c25b056130b..a18f418e48e 100644
--- a/source/blender/compositor/operations/COM_MapRangeOperation.cpp
+++ b/source/blender/compositor/operations/COM_MapRangeOperation.cpp
@@ -51,10 +51,10 @@ void MapRangeOperation::executePixel(float output[4], float x, float y, PixelSam
float dest_min, dest_max;
this->m_inputOperation->read(inputs, x, y, sampler);
- this->m_sourceMinOperation->read(inputs+1, x, y, sampler);
- this->m_sourceMaxOperation->read(inputs+2, x, y, sampler);
- this->m_destMinOperation->read(inputs+3, x, y, sampler);
- this->m_destMaxOperation->read(inputs+4, x, y, sampler);
+ this->m_sourceMinOperation->read(inputs + 1, x, y, sampler);
+ this->m_sourceMaxOperation->read(inputs + 2, x, y, sampler);
+ this->m_destMinOperation->read(inputs + 3, x, y, sampler);
+ this->m_destMaxOperation->read(inputs + 4, x, y, sampler);
value = inputs[0];
source_min = inputs[1];