archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

rename api functions...

Browse Source 
- minf, maxf, mini, maxi --> min_ff, max_ff, min_ii, max_ii
This commit is contained in:
Campbell Barton
2012-10-23 13:28:22 +00:00
parent 9599c2a02b
commit f70d2c65d8
94 changed files with 283 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/compositor/operations/COM_ScreenLensDistortionOperation.cpp
View File

@@ -268,11 +268,11 @@ bool ScreenLensDistortionOperation::determineDependingAreaOfInterest(rcti *input
void ScreenLensDistortionOperation::updateVariables(float distortion, float dispersion)
{
this->m_kg = maxf(minf(distortion, 1.0f), -0.999f);
this->m_kg = max_ff(min_ff(distortion, 1.0f), -0.999f);
// smaller dispersion range for somewhat more control
const float d = 0.25f * maxf(minf(dispersion, 1.0f), 0.0f);
this->m_kr = maxf(minf((this->m_kg + d), 1.0f), -0.999f);
this->m_kb = maxf(minf((this->m_kg - d), 1.0f), -0.999f);
const float d = 0.25f * max_ff(min_ff(dispersion, 1.0f), 0.0f);
this->m_kr = max_ff(min_ff((this->m_kg + d), 1.0f), -0.999f);
this->m_kb = max_ff(min_ff((this->m_kg - d), 1.0f), -0.999f);
this->m_maxk = MAX3(this->m_kr, this->m_kg, this->m_kb);
this->m_sc = (this->m_data->fit && (this->m_maxk > 0.0f)) ? (1.0f / (1.0f + 2.0f * this->m_maxk)) :
(1.0f / (1.0f + this->m_maxk));