diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-02-03 06:55:26 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-03 06:56:34 +0400 |
commit | 1dc1d92dabe08fd78791ab02295c65adefdb61c8 (patch) | |
tree | cea2c3857deb2ca923f041a7e3acce2dc30a1777 | |
parent | 236e46835908f05a54e09cf2774386e5a8ef8be1 (diff) |
Code cleanup: white space and cmake was broken on all platforms
-rw-r--r-- | intern/cycles/kernel/kernel_bvh.h | 8 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_subsurface.h | 4 | ||||
-rw-r--r-- | intern/cycles/render/buffers.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_string.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/util/util_transform.h | 9 | ||||
-rw-r--r-- | intern/iksolver/test/ik_glut_test/intern/main.cpp | 62 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 34 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 2 | ||||
-rw-r--r-- | source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp | 2 | ||||
-rw-r--r-- | source/blender/editors/space_info/space_info.c | 2 | ||||
-rw-r--r-- | source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp | 6 | ||||
-rw-r--r-- | source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp | 2 | ||||
-rw-r--r-- | source/blender/freestyle/intern/stroke/TextStrokeRenderer.h | 16 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 4 | ||||
-rw-r--r-- | source/gameengine/Rasterizer/RAS_MeshObject.cpp | 10 | ||||
-rw-r--r-- | source/tests/CMakeLists.txt | 1 |
16 files changed, 82 insertions, 84 deletions
diff --git a/intern/cycles/kernel/kernel_bvh.h b/intern/cycles/kernel/kernel_bvh.h index 9d3d9c08a3b..4ddee6f656c 100644 --- a/intern/cycles/kernel/kernel_bvh.h +++ b/intern/cycles/kernel/kernel_bvh.h @@ -1043,10 +1043,10 @@ ccl_device_inline float3 curvetangent(float t, float3 p0, float3 p1, float3 p2, float fc = 0.71f; float data[4]; float t2 = t * t; - data[0] = -3.0f * fc * t2 + 4.0f * fc * t - fc; - data[1] = 3.0f * (2.0f - fc) * t2 + 2.0f * (fc - 3.0f) * t; - data[2] = 3.0f * (fc - 2.0f) * t2 + 2.0f * (3.0f - 2.0f * fc) * t + fc; - data[3] = 3.0f * fc * t2 - 2.0f * fc * t; + data[0] = -3.0f * fc * t2 + 4.0f * fc * t - fc; + data[1] = 3.0f * (2.0f - fc) * t2 + 2.0f * (fc - 3.0f) * t; + data[2] = 3.0f * (fc - 2.0f) * t2 + 2.0f * (3.0f - 2.0f * fc) * t + fc; + data[3] = 3.0f * fc * t2 - 2.0f * fc * t; return data[0] * p0 + data[1] * p1 + data[2] * p2 + data[3] * p3; } diff --git a/intern/cycles/kernel/kernel_subsurface.h b/intern/cycles/kernel/kernel_subsurface.h index 2326ca18b55..fb927e81f22 100644 --- a/intern/cycles/kernel/kernel_subsurface.h +++ b/intern/cycles/kernel/kernel_subsurface.h @@ -250,8 +250,8 @@ ccl_device int subsurface_scatter_multi_step(KernelGlobals *kg, ShaderData *sd, } /* sample point on disk */ - float phi = M_2PI_F * disk_u; - float disk_r = disk_v; + float phi = M_2PI_F * disk_u; + float disk_r = disk_v; float disk_height; bssrdf_sample(sc, disk_r, &disk_r, &disk_height); diff --git a/intern/cycles/render/buffers.cpp b/intern/cycles/render/buffers.cpp index 44a050ca530..da1b7484b77 100644 --- a/intern/cycles/render/buffers.cpp +++ b/intern/cycles/render/buffers.cpp @@ -99,7 +99,7 @@ RenderTile::RenderTile() RenderBuffers::RenderBuffers(Device *device_) { - device = device_; + device = device_; } RenderBuffers::~RenderBuffers() diff --git a/intern/cycles/util/util_string.cpp b/intern/cycles/util/util_string.cpp index 61a16b63351..f38d8d3282f 100644 --- a/intern/cycles/util/util_string.cpp +++ b/intern/cycles/util/util_string.cpp @@ -93,7 +93,7 @@ bool string_endswith(const string& s, const char *end) if(len > s.size()) return 0; else - return strncmp(s.c_str() + s.size() - len, end, len) == 0; + return strncmp(s.c_str() + s.size() - len, end, len) == 0; } string string_strip(const string& s) diff --git a/intern/cycles/util/util_transform.h b/intern/cycles/util/util_transform.h index 1b6315ba484..4c7ce12d1de 100644 --- a/intern/cycles/util/util_transform.h +++ b/intern/cycles/util/util_transform.h @@ -264,7 +264,7 @@ ccl_device_inline bool transform_uniform_scale(const Transform& tfm, float& scal /* the epsilon here is quite arbitrary, but this function is only used for * surface area and bump, where we except it to not be so sensitive */ Transform ttfm = transform_transpose(tfm); - float eps = 1e-6f; + float eps = 1e-6f; float sx = len_squared(float4_to_float3(tfm.x)); float sy = len_squared(float4_to_float3(tfm.y)); @@ -275,12 +275,13 @@ ccl_device_inline bool transform_uniform_scale(const Transform& tfm, float& scal if(fabsf(sx - sy) < eps && fabsf(sx - sz) < eps && fabsf(sx - stx) < eps && fabsf(sx - sty) < eps && - fabsf(sx - stz) < eps) { + fabsf(sx - stz) < eps) + { scale = sx; return true; } - - return false; + + return false; } ccl_device_inline bool transform_negative_scale(const Transform& tfm) diff --git a/intern/iksolver/test/ik_glut_test/intern/main.cpp b/intern/iksolver/test/ik_glut_test/intern/main.cpp index 86fea76ef70..bfb9d8fa1a0 100644 --- a/intern/iksolver/test/ik_glut_test/intern/main.cpp +++ b/intern/iksolver/test/ik_glut_test/intern/main.cpp @@ -40,62 +40,58 @@ #include "MyGlutMouseHandler.h" #include "MyGlutKeyHandler.h" #include "ChainDrawer.h" - -void -init(MT_Vector3 min,MT_Vector3 max) + +void init(MT_Vector3 min,MT_Vector3 max) { - GLfloat light_diffuse0[] = {1.0, 0.0, 0.0, 1.0}; /* Red diffuse light. */ GLfloat light_position0[] = {1.0, 1.0, 1.0, 0.0}; /* Infinite light location. */ GLfloat light_diffuse1[] = {1.0, 1.0, 1.0, 1.0}; /* Red diffuse light. */ GLfloat light_position1[] = {1.0, 0, 0, 0.0}; /* Infinite light location. */ - /* Enable a single OpenGL light. */ - glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse0); - glLightfv(GL_LIGHT0, GL_POSITION, light_position0); + /* Enable a single OpenGL light. */ + glLightfv(GL_LIGHT0, GL_DIFFUSE, light_diffuse0); + glLightfv(GL_LIGHT0, GL_POSITION, light_position0); - glLightfv(GL_LIGHT1, GL_DIFFUSE, light_diffuse1); - glLightfv(GL_LIGHT1, GL_POSITION, light_position1); + glLightfv(GL_LIGHT1, GL_DIFFUSE, light_diffuse1); + glLightfv(GL_LIGHT1, GL_POSITION, light_position1); - glEnable(GL_LIGHT0); - glEnable(GL_LIGHT1); - glEnable(GL_LIGHTING); + glEnable(GL_LIGHT0); + glEnable(GL_LIGHT1); + glEnable(GL_LIGHTING); - /* Use depth buffering for hidden surface elimination. */ - glEnable(GL_DEPTH_TEST); + /* Use depth buffering for hidden surface elimination. */ + glEnable(GL_DEPTH_TEST); - /* Setup the view of the cube. */ - glMatrixMode(GL_PROJECTION); + /* Setup the view of the cube. */ + glMatrixMode(GL_PROJECTION); // center of the box + 3* depth of box - MT_Vector3 center = (min + max) * 0.5; - MT_Vector3 diag = max - min; + MT_Vector3 center = (min + max) * 0.5; + MT_Vector3 diag = max - min; float depth = diag.length(); float distance = 2; - gluPerspective( - /* field of view in degree */ 40.0, - /* aspect ratio */ 1.0, - /* Z near */ 1.0, - /* Z far */ distance * depth * 2 - ); - glMatrixMode(GL_MODELVIEW); + gluPerspective(/* field of view in degree */ 40.0, + /* aspect ratio */ 1.0, + /* Z near */ 1.0, + /* Z far */ distance * depth * 2 + ); + glMatrixMode(GL_MODELVIEW); - gluLookAt( - center.x(), center.y(), center.z() + distance*depth, /* eye is at (0,0,5) */ - center.x(), center.y(), center.z(), /* center is at (0,0,0) */ - 0.0, 1.0, 0.); /* up is in positive Y direction */ + gluLookAt(center.x(), center.y(), center.z() + distance*depth, /* eye is at (0,0,5) */ + center.x(), center.y(), center.z(), /* center is at (0,0,0) */ + 0.0, 1.0, 0.); /* up is in positive Y direction */ + + glPushMatrix(); - glPushMatrix(); - } -int -main(int argc, char **argv) + +int main(int argc, char **argv) { diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 94ff1026d12..b8d4ef8167c 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -2659,23 +2659,23 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us void BKE_object_empty_draw_type_set(Object *ob, const int value) { - ob->empty_drawtype = value; - - if (ob->type == OB_EMPTY && ob->empty_drawtype == OB_EMPTY_IMAGE) { - if (!ob->iuser) { - ob->iuser = MEM_callocN(sizeof(ImageUser), "image user"); - ob->iuser->ok = 1; - ob->iuser->frames = 100; - ob->iuser->sfra = 1; - ob->iuser->fie_ima = 2; - } - } - else { - if (ob->iuser) { - MEM_freeN(ob->iuser); - ob->iuser = NULL; - } - } + ob->empty_drawtype = value; + + if (ob->type == OB_EMPTY && ob->empty_drawtype == OB_EMPTY_IMAGE) { + if (!ob->iuser) { + ob->iuser = MEM_callocN(sizeof(ImageUser), "image user"); + ob->iuser->ok = 1; + ob->iuser->frames = 100; + ob->iuser->sfra = 1; + ob->iuser->fie_ima = 2; + } + } + else { + if (ob->iuser) { + MEM_freeN(ob->iuser); + ob->iuser = NULL; + } + } } bool BKE_object_minmax_dupli(Scene *scene, Object *ob, float r_min[3], float r_max[3], const bool use_hidden) diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 460e3f4a59f..a46079088fc 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -2135,7 +2135,7 @@ static VMesh *make_cube_corner_straight(MemArena *mem_arena, int nseg) float co[3]; int i, j, k, ns2; - ns2 = nseg / 2; + ns2 = nseg / 2; vm = new_adj_vmesh(mem_arena, 3, nseg, NULL); vm->count = 0; // reset, so following loop will end up with correct count for (i = 0; i < 3; i++) { diff --git a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp index 400c6b5e3b1..f4c73c31ed8 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp @@ -103,7 +103,7 @@ void GaussianAlphaXBlurOperation::executePixel(float output[4], int x, int y, vo int maxx = x + this->m_rad; // UNUSED miny = max(miny, inputBuffer->getRect()->ymin); minx = max(minx, inputBuffer->getRect()->xmin); - maxx = min(maxx, inputBuffer->getRect()->xmax -1); + maxx = min(maxx, inputBuffer->getRect()->xmax -1); /* *** this is the main part which is different to 'GaussianXBlurOperation' *** */ diff --git a/source/blender/editors/space_info/space_info.c b/source/blender/editors/space_info/space_info.c index c029a4bf0bc..f23e50a8650 100644 --- a/source/blender/editors/space_info/space_info.c +++ b/source/blender/editors/space_info/space_info.c @@ -222,7 +222,7 @@ static void info_keymap(struct wmKeyConfig *keyconf) WM_keymap_add_item(keymap, "INFO_OT_report_delete", DELKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "INFO_OT_report_copy", CKEY, KM_PRESS, KM_CTRL, 0); #ifdef __APPLE__ - WM_keymap_add_item(keymap, "INFO_OT_report_copy", CKEY, KM_PRESS, KM_OSKEY, 0); + WM_keymap_add_item(keymap, "INFO_OT_report_copy", CKEY, KM_PRESS, KM_OSKEY, 0); #endif } diff --git a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp index 89a5c369cd4..9329bd40c76 100644 --- a/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp +++ b/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp @@ -102,9 +102,9 @@ static int AdjacencyIterator_init(BPy_AdjacencyIterator *self, PyObject *args, P static PyObject *AdjacencyIterator_iter(BPy_AdjacencyIterator *self) { - Py_INCREF(self); - self->at_start = true; - return (PyObject *) self; + Py_INCREF(self); + self->at_start = true; + return (PyObject *) self; } static PyObject *AdjacencyIterator_iternext(BPy_AdjacencyIterator *self) diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp index 73b3c9a2ca0..0fbc0ef3472 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp @@ -65,7 +65,7 @@ static char UnaryFunction0DUnsigned___doc__[] = "\n" ".. method:: __init__()\n" "\n" - " Default constructor.\n"; +" Default constructor.\n"; static int UnaryFunction0DUnsigned___init__(BPy_UnaryFunction0DUnsigned *self, PyObject *args, PyObject *kwds) { diff --git a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h index 42402f318ef..8e89847ca3d 100644 --- a/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h +++ b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h @@ -55,18 +55,18 @@ namespace Freestyle { class LIB_STROKE_EXPORT TextStrokeRenderer : public StrokeRenderer { public: - TextStrokeRenderer(const char *iFileName = NULL); - virtual ~TextStrokeRenderer(); + TextStrokeRenderer(const char *iFileName = NULL); + virtual ~TextStrokeRenderer(); - /*! Renders a stroke rep */ - virtual void RenderStrokeRep(StrokeRep *iStrokeRep) const; - virtual void RenderStrokeRepBasic(StrokeRep *iStrokeRep) const; + /*! Renders a stroke rep */ + virtual void RenderStrokeRep(StrokeRep *iStrokeRep) const; + virtual void RenderStrokeRepBasic(StrokeRep *iStrokeRep) const; - /*! Closes the output file */ - void Close(); + /*! Closes the output file */ + void Close(); protected: - mutable ofstream _ofstream; + mutable ofstream _ofstream; }; } /* namespace Freestyle */ diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 41f34f0f40e..c8ade9366fb 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -488,9 +488,9 @@ static EnumPropertyItem *rna_Object_parent_type_itemf(bContext *UNUSED(C), Point static void rna_Object_empty_draw_type_set(PointerRNA *ptr, int value) { - Object *ob = (Object *)ptr->data; + Object *ob = (Object *)ptr->data; - BKE_object_empty_draw_type_set(ob, value); + BKE_object_empty_draw_type_set(ob, value); } static EnumPropertyItem *rna_Object_collision_bounds_itemf(bContext *UNUSED(C), PointerRNA *ptr, diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.cpp b/source/gameengine/Rasterizer/RAS_MeshObject.cpp index ff909b5955f..54b15f07896 100644 --- a/source/gameengine/Rasterizer/RAS_MeshObject.cpp +++ b/source/gameengine/Rasterizer/RAS_MeshObject.cpp @@ -538,12 +538,12 @@ void RAS_MeshObject::SortPolygons(RAS_MeshSlot& ms, const MT_Transform &transfor bool RAS_MeshObject::HasColliderPolygon() { - int numpolys= NumPolygons(); - for (int p=0; p<numpolys; p++) - if (m_Polygons[p]->IsCollider()) - return true; + int numpolys= NumPolygons(); + for (int p=0; p<numpolys; p++) + if (m_Polygons[p]->IsCollider()) + return true; - return false; + return false; } void RAS_MeshObject::SchedulePolygons(int drawingmode) diff --git a/source/tests/CMakeLists.txt b/source/tests/CMakeLists.txt index 8543a3c7fb6..21b5ad93546 100644 --- a/source/tests/CMakeLists.txt +++ b/source/tests/CMakeLists.txt @@ -39,6 +39,7 @@ if(APPLE) set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/$(CONFIGURATION)/blender.app/Contents/MacOS/blender) else() set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/blender.app/Contents/MacOS/blender) + endif() else() set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/blender) endif() |