diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-04 20:19:08 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-04 20:19:08 +0400 |
| commit | dc13969e484ed9fa6834b1aba85ba00f65bf8a11 (patch) | |
| tree | affc2efd3e5c8637fbfcaf0b3be87a78781876b9 /intern/cycles/app | |
| parent | e86dbf687769a7f38ab465c89d1111a8be691ca2 (diff) | |
Style cleanup: indentation, braces
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/cycles_standalone.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/app/cycles_xml.h | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp index 9871273381e..7ea1ca2d8fb 100644 --- a/intern/cycles/app/cycles_standalone.cpp +++ b/intern/cycles/app/cycles_standalone.cpp @@ -214,7 +214,7 @@ static void motion(int x, int y, int button) /* Rotate */ else if(button == 2) { - float4 r1= make_float4((float)x * 0.1f, 0.0f, 1.0f, 0.0f); + float4 r1 = make_float4((float)x * 0.1f, 0.0f, 1.0f, 0.0f); matrix = matrix * transform_rotate(DEG2RADF(r1.x), make_float3(r1.y, r1.z, r1.w)); float4 r2 = make_float4(y * 0.1f, 1.0f, 0.0f, 0.0f); diff --git a/intern/cycles/app/cycles_xml.h b/intern/cycles/app/cycles_xml.h index 2d225f3a013..96bc79c35d8 100644 --- a/intern/cycles/app/cycles_xml.h +++ b/intern/cycles/app/cycles_xml.h @@ -14,8 +14,8 @@ * limitations under the License */ -#ifndef __CYCLES_XML__ -#define __CYCLES_XML__ +#ifndef __CYCLES_XML_H__ +#define __CYCLES_XML_H__ CCL_NAMESPACE_BEGIN @@ -29,5 +29,4 @@ void xml_read_file(Scene *scene, const char *filepath); CCL_NAMESPACE_END -#endif /* __CYCLES_XML__ */ - +#endif /* __CYCLES_XML_H__ */ |