tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

style cleanup

This commit is contained in:
Campbell Barton 2012-10-28 15:23:16 +00:00
parent d800cffaf1
commit 0c6a0b293f
14 changed files with 58 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/bmesh/intern/bmesh_decimate_collapse.c
View File

@ -395,6 +395,7 @@ static void bm_edge_collapse_loop_customdata(BMesh *bm, BMLoop *l, BMVert *v_cle
BLI_assert(l_clear->v == v_clear);
BLI_assert(l_other->v == v_other);
(void)v_other; /* quiet warnings for release */
/* now we have both corners of the face 'l->f' */
for (side = 0; side < 2; side++) {

9
source/blender/compositor/operations/COM_CropOperation.cpp
View File

@ -37,8 +37,7 @@ void CropBaseOperation::updateArea()
float width = inputReference->getWidth();
float height = inputReference->getHeight();
if (width > 0.0f && height > 0.0f)
{
if (width > 0.0f && height > 0.0f) {
if (this->m_relative) {
this->m_settings->x1 = width * this->m_settings->fac_x1;
this->m_settings->x2 = width * this->m_settings->fac_x2;
@ -114,12 +113,10 @@ void CropImageOperation::determineResolution(unsigned int resolution[2], unsigne
void CropImageOperation::executePixel(float output[4], float x, float y, PixelSampler sampler)
{
if (x >= 0 && x < getWidth() && y >= 0 && y < getHeight())
{
if (x >= 0 && x < getWidth() && y >= 0 && y < getHeight()) {
this->m_inputOperation->read(output, (x + this->m_xmin), (y + this->m_ymin), sampler);
}
else
{
else {
zero_v4(output);
}
}