diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-12-22 07:11:10 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-12-22 07:12:19 +0400 |
| commit | c1c26c36f62c3bfdb40b01f33004695a09ce2f4d (patch) | |
| tree | 21e738fefe0c7d77af7c1129bcdfef65e1a8f655 /intern | |
| parent | 5eb96d4705b93a7049ecabd0827e0e58b28a2838 (diff) | |
Style Cleanup: remove preprocessor indentation (updated wiki style guide too)
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 8 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_DisplayManagerX11.cpp | 4 | ||||
| -rw-r--r-- | intern/ghost/test/gears/GHOST_Test.cpp | 2 | ||||
| -rw-r--r-- | intern/mikktspace/mikktspace.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index fcc92b641fd..c26ff7e7306 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -2473,9 +2473,9 @@ ParticleInfoNode::ParticleInfoNode() add_output("Age", SHADER_SOCKET_FLOAT); add_output("Lifetime", SHADER_SOCKET_FLOAT); add_output("Location", SHADER_SOCKET_POINT); - #if 0 /* not yet supported */ +#if 0 /* not yet supported */ add_output("Rotation", SHADER_SOCKET_QUATERNION); - #endif +#endif add_output("Size", SHADER_SOCKET_FLOAT); add_output("Velocity", SHADER_SOCKET_VECTOR); add_output("Angular Velocity", SHADER_SOCKET_VECTOR); @@ -2491,10 +2491,10 @@ void ParticleInfoNode::attributes(AttributeRequestSet *attributes) attributes->add(ATTR_STD_PARTICLE); if(!output("Location")->links.empty()) attributes->add(ATTR_STD_PARTICLE); - #if 0 /* not yet supported */ +#if 0 /* not yet supported */ if(!output("Rotation")->links.empty()) attributes->add(ATTR_STD_PARTICLE); - #endif +#endif if(!output("Size")->links.empty()) attributes->add(ATTR_STD_PARTICLE); if(!output("Velocity")->links.empty()) diff --git a/intern/ghost/intern/GHOST_DisplayManagerX11.cpp b/intern/ghost/intern/GHOST_DisplayManagerX11.cpp index 7830f42cbb7..f63a93eebb8 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerX11.cpp +++ b/intern/ghost/intern/GHOST_DisplayManagerX11.cpp @@ -241,12 +241,12 @@ setCurrentDisplaySetting( } if (best_fit != -1) { - # ifdef _DEBUG +# ifdef _DEBUG printf("Switching to video mode %dx%d %dx%d %d\n", vidmodes[best_fit]->hdisplay, vidmodes[best_fit]->vdisplay, vidmodes[best_fit]->htotal, vidmodes[best_fit]->vtotal, calculate_rate(vidmodes[best_fit])); - # endif +# endif /* change to the mode */ XF86VidModeSwitchToMode(dpy, scrnum, vidmodes[best_fit]); diff --git a/intern/ghost/test/gears/GHOST_Test.cpp b/intern/ghost/test/gears/GHOST_Test.cpp index 6709956e2dd..78e5257be1f 100644 --- a/intern/ghost/test/gears/GHOST_Test.cpp +++ b/intern/ghost/test/gears/GHOST_Test.cpp @@ -468,7 +468,7 @@ bool Application::processEvent(GHOST_IEvent *event) std::cout << "GHOST_kEventCursorButton"; break; case GHOST_kEventCursorMove: std::cout << "GHOST_kEventCursorMove"; break; - #endif +#endif case GHOST_kEventWheel: { GHOST_TEventWheelData *wheelData = (GHOST_TEventWheelData *) event->getData(); diff --git a/intern/mikktspace/mikktspace.c b/intern/mikktspace/mikktspace.c index 62aa2da2517..822e5fbc44e 100644 --- a/intern/mikktspace/mikktspace.c +++ b/intern/mikktspace/mikktspace.c @@ -429,9 +429,9 @@ typedef struct { static const int g_iCells = 2048; #ifdef _MSC_VER - #define NOINLINE __declspec(noinline) +# define NOINLINE __declspec(noinline) #else - #define NOINLINE __attribute__ ((noinline)) +# define NOINLINE __attribute__ ((noinline)) #endif // it is IMPORTANT that this function is called to evaluate the hash since |