Commit: a3fac84c733f2bf0837dd2719199ee9b76bb7b36
Author: Campbell Barton
Date: Tue Aug 5 13:36:35 2014 +1000
Branches: master
https://developer.blender.org/rBa3fac84c733f2bf0837dd2719199ee9b76bb7b36
Cleanup: indentation
===================================================================
M source/blender/blenkernel/intern/mesh_evaluate.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/compositor/operations/COM_MathBaseOperation.cpp
M source/blender/compositor/operations/COM_MathBaseOperation.h
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/io/io_collada.c
M source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
M source/blender/gpu/intern/gpu_buffers.c
===================================================================
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c
b/source/blender/blenkernel/intern/mesh_evaluate.c
index 83b6d6c..d244dcc 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.c
+++ b/source/blender/blenkernel/intern/mesh_evaluate.c
@@ -731,7 +731,7 @@ void BKE_mesh_loop_tangents(Mesh *mesh, const char *uvmap,
float (*r_looptangent
}
BKE_mesh_loop_tangents_ex(mesh->mvert, mesh->totvert, mesh->mloop,
r_looptangents,
- loopnors, loopuvs, mesh->totloop, mesh->mpoly,
mesh->totpoly, reports);
+ loopnors, loopuvs, mesh->totloop,
mesh->mpoly, mesh->totpoly, reports);
}
/** \} */
diff --git a/source/blender/blenkernel/intern/sequencer.c
b/source/blender/blenkernel/intern/sequencer.c
index 622ec25..dedf5e8 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2225,7 +2225,7 @@ static ImBuf *seq_render_effect_execute_threaded(struct
SeqEffectHandle *sh, con
init_data.out = out;
IMB_processor_apply_threaded(out->y, sizeof(RenderEffectThread),
&init_data,
- render_effect_execute_init_handle,
render_effect_execute_do_thread);
+ render_effect_execute_init_handle,
render_effect_execute_do_thread);
return out;
}
diff --git a/source/blender/compositor/operations/COM_MathBaseOperation.cpp
b/source/blender/compositor/operations/COM_MathBaseOperation.cpp
index cbc60b5..32a1e77 100644
--- a/source/blender/compositor/operations/COM_MathBaseOperation.cpp
+++ b/source/blender/compositor/operations/COM_MathBaseOperation.cpp
@@ -335,12 +335,11 @@ void MathModuloOperation::executePixelSampled(float
output[4], float x, float y,
void MathAbsoluteOperation::executePixelSampled(float output[4], float x,
float y, PixelSampler sampler)
{
- float inputValue1[4];
+ float inputValue1[4];
- this->m_inputValue1Operation->readSampled(inputValue1, x, y, sampler);
+ this->m_inputValue1Operation->readSampled(inputValue1, x, y, sampler);
- output[0] = fabs(inputValue1[0]);
+ output[0] = fabs(inputValue1[0]);
- clampIfNeeded(output);
+ clampIfNeeded(output);
}
-
diff --git a/source/blender/compositor/operations/COM_MathBaseOperation.h
b/source/blender/compositor/operations/COM_MathBaseOperation.h
index 05d2bb0..32cd19f 100644
--- a/source/blender/compositor/operations/COM_MathBaseOperation.h
+++ b/source/blender/compositor/operations/COM_MathBaseOperation.h
@@ -165,8 +165,8 @@ public:
class MathAbsoluteOperation : public MathBaseOperation {
public:
- MathAbsoluteOperation() : MathBaseOperation() {}
- void executePixelSampled(float output[4], float x, float y, PixelSampler
sampler);
+ MathAbsoluteOperation() : MathBaseOperation() {}
+ void executePixelSampled(float output[4], float x, float y,
PixelSampler sampler);
};
#endif
diff --git a/source/blender/editors/animation/anim_channels_edit.c
b/source/blender/editors/animation/anim_channels_edit.c
index 9707804..b6ab040 100644
--- a/source/blender/editors/animation/anim_channels_edit.c
+++ b/source/blender/editors/animation/anim_channels_edit.c
@@ -901,10 +901,10 @@ static void
rearrange_animchannels_filter_visible(ListBase *anim_data_visible, b
{
ListBase anim_data = {NULL, NULL};
bAnimListElem *ale, *ale_next;
- int filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE |
ANIMFILTER_LIST_CHANNELS);
+ int filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE |
ANIMFILTER_LIST_CHANNELS);
/* get all visible channels */
- ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
+ ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
/* now, only keep the ones that are of the types we are interested in */
for (ale = anim_data.first; ale; ale = ale_next) {
diff --git a/source/blender/editors/io/io_collada.c
b/source/blender/editors/io/io_collada.c
index 4d2ea0e..a413054 100644
--- a/source/blender/editors/io/io_collada.c
+++ b/source/blender/editors/io/io_collada.c
@@ -250,7 +250,7 @@ static void uiCollada_exportSettings(uiLayout *layout,
PointerRNA *imfptr)
row = uiLayoutRow(box, false);
split = uiLayoutSplit(row, 0.6f, UI_LAYOUT_ALIGN_RIGHT);
- uiItemL(split, IFACE_("Transformation Type"), ICON_NONE);
+ uiItemL(split, IFACE_("Transformation Type"), ICON_NONE);
uiItemR(split, imfptr, "export_transformation_type_selection", 0, "",
ICON_NONE);
row = uiLayoutRow(box, false);
diff --git
a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
index 7239b1b..1ef2979 100644
--- a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
+++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
@@ -186,9 +186,9 @@ PyDoc_STRVAR(CurvePoint_fedge_doc,
static PyObject *CurvePoint_fedge_get(BPy_CurvePoint *self, void
*UNUSED(closure))
{
- SVertex *A = self->cp->A();
- Interface0D *B = (Interface0D *)self->cp->B();
- return Any_BPy_Interface1D_from_Interface1D(*(A->getFEdge(*B)));
+ SVertex *A = self->cp->A();
+ Interface0D *B = (Interface0D *)self->cp->B();
+ return Any_BPy_Interface1D_from_Interface1D(*(A->getFEdge(*B)));
}
PyDoc_STRVAR(CurvePoint_t2d_doc,
diff --git a/source/blender/gpu/intern/gpu_buffers.c
b/source/blender/gpu/intern/gpu_buffers.c
index 0cd4635..61f095f 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -616,7 +616,7 @@ static GPUBuffer *gpu_buffer_setup(DerivedMesh *dm,
GPUDrawObject *object,
}
mat_orig_to_new = MEM_mallocN(sizeof(*mat_orig_to_new) * dm->totmat,
- "GPU_buffer_setup.mat_orig_to_new");
+ "GPU_buffer_setup.mat_orig_to_new");
cur_index_per_mat = MEM_mallocN(sizeof(int) * object->totmaterial,
"GPU_buffer_setup.cur_index_per_mat");
for (i = 0; i < object->totmaterial; i++) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
