forked from bartvdbraak/blender
style cleanup
This commit is contained in:
parent
9051868564
commit
162c331417
@ -1559,7 +1559,7 @@ static void old_mdisps_convert(MFace *mface, MDisps *mdisp)
|
||||
if (S == 1) { (*out)[1] = -(*out)[1]; }
|
||||
else if (S == 2) { SWAP(float, (*out)[0], (*out)[1]); }
|
||||
else if (S == 3) { (*out)[0] = -(*out)[0]; }
|
||||
else if (S == 0) { SWAP(float, (*out)[0], (*out)[1]); (*out)[0] = -(*out)[0]; (*out)[1] = -(*out)[1]; };
|
||||
else if (S == 0) { SWAP(float, (*out)[0], (*out)[1]); (*out)[0] = -(*out)[0]; (*out)[1] = -(*out)[1]; }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -387,7 +387,7 @@ static short edbm_extrude_edge(Object *obedit, BMEditMesh *em, const char hflag,
|
||||
if (ele->head.htype == BM_FACE) {
|
||||
f = (BMFace *)ele;
|
||||
add_normal_aligned(nor, f->no);
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
normalize_v3(nor);
|
||||
|
@ -47,7 +47,7 @@ unsigned int mem_read(Stream & mem, unsigned long long & i)
|
||||
if (mem.pos + 8 > mem.size) {
|
||||
printf("DDS: trying to read beyond end of stream (corrupt file?)");
|
||||
return(0);
|
||||
};
|
||||
}
|
||||
memcpy(&i, mem.mem + mem.pos, 8); // @@ todo: make sure little endian
|
||||
mem.pos += 8;
|
||||
return(8);
|
||||
@ -58,7 +58,7 @@ unsigned int mem_read(Stream & mem, unsigned int & i)
|
||||
if (mem.pos + 4 > mem.size) {
|
||||
printf("DDS: trying to read beyond end of stream (corrupt file?)");
|
||||
return(0);
|
||||
};
|
||||
}
|
||||
memcpy(&i, mem.mem + mem.pos, 4); // @@ todo: make sure little endian
|
||||
mem.pos += 4;
|
||||
return(4);
|
||||
@ -69,7 +69,7 @@ unsigned int mem_read(Stream & mem, unsigned short & i)
|
||||
if (mem.pos + 2 > mem.size) {
|
||||
printf("DDS: trying to read beyond end of stream (corrupt file?)");
|
||||
return(0);
|
||||
};
|
||||
}
|
||||
memcpy(&i, mem.mem + mem.pos, 2); // @@ todo: make sure little endian
|
||||
mem.pos += 2;
|
||||
return(2);
|
||||
@ -80,7 +80,7 @@ unsigned int mem_read(Stream & mem, unsigned char & i)
|
||||
if (mem.pos + 1 > mem.size) {
|
||||
printf("DDS: trying to read beyond end of stream (corrupt file?)");
|
||||
return(0);
|
||||
};
|
||||
}
|
||||
i = (mem.mem + mem.pos)[0];
|
||||
mem.pos += 1;
|
||||
return(1);
|
||||
@ -91,7 +91,7 @@ unsigned int mem_read(Stream & mem, unsigned char *i, unsigned int cnt)
|
||||
if (mem.pos + cnt > mem.size) {
|
||||
printf("DDS: trying to read beyond end of stream (corrupt file?)");
|
||||
return(0);
|
||||
};
|
||||
}
|
||||
memcpy(i, mem.mem + mem.pos, cnt);
|
||||
mem.pos += cnt;
|
||||
return(cnt);
|
||||
|
@ -136,9 +136,9 @@ struct ImBuf *imb_load_dds(unsigned char *mem, size_t size, int flags, char colo
|
||||
if (pixel.a != 255) {
|
||||
bits_per_pixel = 32;
|
||||
break;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
ibuf = IMB_allocImBuf(dds.width(), dds.height(), bits_per_pixel, 0);
|
||||
if (ibuf == 0) return(0); /* memory allocation failed */
|
||||
|
||||
|
@ -332,7 +332,7 @@ int IMB_proxy_size_to_array_index(IMB_Proxy_Size pr_size)
|
||||
return 3;
|
||||
default:
|
||||
return 0;
|
||||
};
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -352,7 +352,7 @@ int IMB_timecode_to_array_index(IMB_Timecode_Type tc)
|
||||
return 3;
|
||||
default:
|
||||
return 0;
|
||||
};
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
@ -385,7 +385,8 @@ static void init_laplacian_matrix(LaplacianSystem *sys)
|
||||
sys->ring_areas[idv2] += average_area_quad_v3(v2, v3, v4, v1);
|
||||
sys->ring_areas[idv3] += average_area_quad_v3(v3, v4, v1, v2);
|
||||
sys->ring_areas[idv4] += average_area_quad_v3(v4, v1, v2, v3);
|
||||
} else {
|
||||
}
|
||||
else {
|
||||
sys->ring_areas[idv1] += areaf;
|
||||
sys->ring_areas[idv2] += areaf;
|
||||
sys->ring_areas[idv3] += areaf;
|
||||
|
Loading…
Reference in New Issue
Block a user