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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-02-03 06:55:26 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-02-03 06:56:34 +0400
commit1dc1d92dabe08fd78791ab02295c65adefdb61c8 (patch)
treecea2c3857deb2ca923f041a7e3acce2dc30a1777 /source/blender
parent236e46835908f05a54e09cf2774386e5a8ef8be1 (diff)
Code cleanup: white space and cmake was broken on all platforms
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/blenkernel/intern/object.c34
-rw-r--r--source/blender/bmesh/tools/bmesh_bevel.c2
-rw-r--r--source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.cpp2
-rw-r--r--source/blender/editors/space_info/space_info.c2
-rw-r--r--source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp6
-rw-r--r--source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp2
-rw-r--r--source/blender/freestyle/intern/stroke/TextStrokeRenderer.h16
-rw-r--r--source/blender/makesrna/intern/rna_object.c4
8 files changed, 34 insertions, 34 deletions
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,