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
path: root/intern
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-06-07 02:38:39 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-07 02:38:39 +0400
commitd5032657edd365ded8b98500536ecdbe1b54df5a (patch)
tree73bb5897da4b67ff37b9639471520bdcdeef16f7 /intern
parent379c4ae4d8b92ae444c0372dc54872c72b10c199 (diff)
style cleanup
Diffstat (limited to 'intern')
-rw-r--r--intern/container/CTR_UHeap.h6
-rw-r--r--intern/cycles/util/util_system.cpp4
-rw-r--r--intern/ghost/GHOST_Types.h3
-rw-r--r--intern/mikktspace/mikktspace.c21
-rw-r--r--intern/mikktspace/mikktspace.h3
5 files changed, 14 insertions, 23 deletions
diff --git a/intern/container/CTR_UHeap.h b/intern/container/CTR_UHeap.h
index ad3d7d2bb02..8711d4375cb 100644
--- a/intern/container/CTR_UHeap.h
+++ b/intern/container/CTR_UHeap.h
@@ -56,7 +56,7 @@ class CTR_UHeapable {
public :
int &
HeapPos(
- ){
+ ) {
return m_ind;
};
float &
@@ -93,7 +93,7 @@ protected :
};
~CTR_UHeapable(
- ){
+ ) {
};
};
@@ -214,7 +214,7 @@ private:
HeapType *base,
int i,
int j
- ){
+ ) {
std::swap(m_vector[i],m_vector[j]);
CTR_UHeapable *heap_i = base + m_vector[i];
diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp
index e8c81e57654..ad7f3347cee 100644
--- a/intern/cycles/util/util_system.cpp
+++ b/intern/cycles/util/util_system.cpp
@@ -152,7 +152,7 @@ bool system_cpu_support_optimized()
/*__cpuid(result, 0x80000000);
num_ex = result[0];*/
- if(num >= 1){
+ if(num >= 1) {
__cpuid(result, 0x00000001);
caps.mmx = (result[3] & ((int)1 << 23)) != 0;
caps.sse = (result[3] & ((int)1 << 25)) != 0;
@@ -167,7 +167,7 @@ bool system_cpu_support_optimized()
caps.fma3 = (result[2] & ((int)1 << 12)) != 0;
}
- /*if(num_ex >= 0x80000001){
+ /*if(num_ex >= 0x80000001) {
__cpuid(result, 0x80000001);
caps.x64 = (result[3] & ((int)1 << 29)) != 0;
caps.sse4a = (result[2] & ((int)1 << 6)) != 0;
diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h
index 7614cb80e00..8454f338645 100644
--- a/intern/ghost/GHOST_Types.h
+++ b/intern/ghost/GHOST_Types.h
@@ -56,8 +56,7 @@ typedef unsigned long long GHOST_TUns64;
typedef void *GHOST_TUserDataPtr;
-typedef enum
-{
+typedef enum {
GHOST_kFailure = 0,
GHOST_kSuccess
} GHOST_TSuccess;
diff --git a/intern/mikktspace/mikktspace.c b/intern/mikktspace/mikktspace.c
index cba4c406759..0a3141d6782 100644
--- a/intern/mikktspace/mikktspace.c
+++ b/intern/mikktspace/mikktspace.c
@@ -40,8 +40,7 @@
#define INTERNAL_RND_SORT_SEED 39871946
// internal structure
-typedef struct
-{
+typedef struct {
float x, y, z;
} SVec3;
@@ -119,14 +118,12 @@ static tbool VNotZero(const SVec3 v)
-typedef struct
-{
+typedef struct {
int iNrFaces;
int * pTriMembers;
} SSubGroup;
-typedef struct
-{
+typedef struct {
int iNrFaces;
int * pFaceIndices;
int iVertexRepresentitive;
@@ -141,8 +138,7 @@ typedef struct
-typedef struct
-{
+typedef struct {
int FaceNeighbors[3];
SGroup * AssignedGroup[3];
@@ -156,8 +152,7 @@ typedef struct
unsigned char vert_num[4];
} STriInfo;
-typedef struct
-{
+typedef struct {
SVec3 vOs;
float fMagS;
SVec3 vOt;
@@ -426,8 +421,7 @@ tbool genTangSpace(const SMikkTSpaceContext * pContext, const float fAngularThre
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef struct
-{
+typedef struct {
float vert[3];
int index;
} STmpVert;
@@ -911,8 +905,7 @@ static SVec3 GetTexCoord(const SMikkTSpaceContext * pContext, const int index)
/////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////////////
-typedef union
-{
+typedef union {
struct
{
int i0, i1, f;
diff --git a/intern/mikktspace/mikktspace.h b/intern/mikktspace/mikktspace.h
index dc2308f6116..52c44a713c6 100644
--- a/intern/mikktspace/mikktspace.h
+++ b/intern/mikktspace/mikktspace.h
@@ -62,8 +62,7 @@ extern "C" {
typedef int tbool;
typedef struct SMikkTSpaceContext SMikkTSpaceContext;
-typedef struct
-{
+typedef struct {
// Returns the number of faces (triangles/quads) on the mesh to be processed.
int (*m_getNumFaces)(const SMikkTSpaceContext * pContext);