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>2013-03-10 09:19:29 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-03-10 09:19:29 +0400
commit74857241607cd828acbb7b8b4e2f425beea802c8 (patch)
tree16c511b7e372b413aff8557a4f3fcbf1999215e3 /source/blender/editors
parent2022567116319a1756098715adb475eb49d8c6a9 (diff)
style cleanup: whitespace
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/animation/keyframing.c2
-rw-r--r--source/blender/editors/sculpt_paint/sculpt_undo.c40
2 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index 45082e4235e..f68ff90105d 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -1636,7 +1636,7 @@ static int insert_key_button_exec(bContext *C, wmOperator *op)
else {
BKE_reportf(op->reports, RPT_WARNING,
"Button doesn't appear to have any property information attached (ptr.data = %p, prop = %p)",
- (void *)ptr.data, (void *)prop);
+ (void *)ptr.data, (void *)prop);
}
}
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c
index b49cbf7ff2b..0368bac4fdc 100644
--- a/source/blender/editors/sculpt_paint/sculpt_undo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.c
@@ -267,8 +267,8 @@ static int sculpt_undo_restore_mask(bContext *C, DerivedMesh *dm, SculptUndoNode
}
static void sculpt_undo_bmesh_restore_generic(SculptUndoNode *unode,
- Object *ob,
- SculptSession *ss)
+ Object *ob,
+ SculptSession *ss)
{
if (unode->applied) {
BM_log_undo(ss->bm, ss->bm_log);
@@ -286,7 +286,7 @@ static void sculpt_undo_bmesh_restore_generic(SculptUndoNode *unode,
/* Create empty sculpt BMesh and enable logging */
static void sculpt_undo_bmesh_enable(Object *ob,
- SculptUndoNode *unode)
+ SculptUndoNode *unode)
{
SculptSession *ss = ob->sculpt;
Mesh *me = ob->data;
@@ -300,13 +300,13 @@ static void sculpt_undo_bmesh_enable(Object *ob,
/* Restore the BMLog using saved entries */
ss->bm_log = BM_log_from_existing_entries_create(ss->bm,
- unode->bm_entry);
+ unode->bm_entry);
}
static void sculpt_undo_bmesh_restore_begin(bContext *C,
- SculptUndoNode *unode,
- Object *ob,
- SculptSession *ss)
+ SculptUndoNode *unode,
+ Object *ob,
+ SculptSession *ss)
{
if (unode->applied) {
sculpt_dynamic_topology_disable(C, unode);
@@ -323,9 +323,9 @@ static void sculpt_undo_bmesh_restore_begin(bContext *C,
}
static void sculpt_undo_bmesh_restore_end(bContext *C,
- SculptUndoNode *unode,
- Object *ob,
- SculptSession *ss)
+ SculptUndoNode *unode,
+ Object *ob,
+ SculptSession *ss)
{
if (unode->applied) {
sculpt_undo_bmesh_enable(ob, unode);
@@ -347,9 +347,9 @@ static void sculpt_undo_bmesh_restore_end(bContext *C,
* Returns TRUE if this was a dynamic-topology undo step, otherwise
* returns FALSE to indicate the non-dyntopo code should run. */
static int sculpt_undo_bmesh_restore(bContext *C,
- SculptUndoNode *unode,
- Object *ob,
- SculptSession *ss)
+ SculptUndoNode *unode,
+ Object *ob,
+ SculptSession *ss)
{
switch (unode->type) {
case SCULPT_UNDO_DYNTOPO_BEGIN:
@@ -567,7 +567,7 @@ static SculptUndoNode *sculpt_undo_alloc_node(Object *ob, PBVHNode *node,
if (node) {
BKE_pbvh_node_num_verts(ss->pbvh, node, &totvert, &allvert);
BKE_pbvh_node_get_grids(ss->pbvh, node, &grids, &totgrid,
- &maxgrid, &gridsize, NULL, NULL);
+ &maxgrid, &gridsize, NULL, NULL);
unode->totvert = totvert;
}
@@ -677,8 +677,8 @@ static void sculpt_undo_store_mask(Object *ob, SculptUndoNode *unode)
}
static SculptUndoNode *sculpt_undo_bmesh_push(Object *ob,
- PBVHNode *node,
- SculptUndoType type)
+ PBVHNode *node,
+ SculptUndoType type)
{
ListBase *lb = undo_paint_push_get_list(UNDO_PAINT_MESH);
SculptUndoNode *unode = lb->first;
@@ -705,13 +705,13 @@ static SculptUndoNode *sculpt_undo_bmesh_push(Object *ob,
* (converting polys to triangles) that the BMLog can't
* fully restore from */
CustomData_copy(&me->vdata, &unode->bm_enter_vdata, CD_MASK_MESH,
- CD_DUPLICATE, me->totvert);
+ CD_DUPLICATE, me->totvert);
CustomData_copy(&me->edata, &unode->bm_enter_edata, CD_MASK_MESH,
- CD_DUPLICATE, me->totedge);
+ CD_DUPLICATE, me->totedge);
CustomData_copy(&me->ldata, &unode->bm_enter_ldata, CD_MASK_MESH,
- CD_DUPLICATE, me->totloop);
+ CD_DUPLICATE, me->totloop);
CustomData_copy(&me->pdata, &unode->bm_enter_pdata, CD_MASK_MESH,
- CD_DUPLICATE, me->totpoly);
+ CD_DUPLICATE, me->totpoly);
unode->bm_enter_totvert = me->totvert;
unode->bm_enter_totedge = me->totedge;
unode->bm_enter_totloop = me->totloop;