diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-23 18:51:49 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-23 19:58:01 +0300 |
| commit | b79b8478ee3bb1b115c5d6b8bdb0cc74d5169955 (patch) | |
| tree | d67b529dc95488186255631660d3251cfb5da5da /source/blender/blenkernel/intern/softbody.c | |
| parent | 2f9df08aa8eaad1127f1b44aed518e1beaf91df7 (diff) | |
Cleanup: Rename ViewLayer *sl > ViewLayer *view_layer
Diffstat (limited to 'source/blender/blenkernel/intern/softbody.c')
| -rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 1f69fca07fe..d7d274f32b5 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -514,7 +514,7 @@ static void ccd_build_deflector_hash_single(GHash *hash, Object *ob) /** * \note group overrides scene when not NULL. */ -static void ccd_build_deflector_hash(ViewLayer *sl, Group *group, Object *vertexowner, GHash *hash) +static void ccd_build_deflector_hash(ViewLayer *view_layer, Group *group, Object *vertexowner, GHash *hash) { Object *ob; @@ -532,7 +532,7 @@ static void ccd_build_deflector_hash(ViewLayer *sl, Group *group, Object *vertex } } else { - for (Base *base = FIRSTBASE(sl); base; base = base->next) { + for (Base *base = FIRSTBASE(view_layer); base; base = base->next) { /*Only proceed for mesh object in same layer */ if (base->object->type == OB_MESH) { ob = base->object; @@ -560,7 +560,7 @@ static void ccd_update_deflector_hash_single(GHash *hash, Object *ob) /** * \note group overrides scene when not NULL. */ -static void ccd_update_deflector_hash(ViewLayer *sl, Group *group, Object *vertexowner, GHash *hash) +static void ccd_update_deflector_hash(ViewLayer *view_layer, Group *group, Object *vertexowner, GHash *hash) { Object *ob; @@ -578,7 +578,7 @@ static void ccd_update_deflector_hash(ViewLayer *sl, Group *group, Object *verte } } else { - for (Base *base = FIRSTBASE(sl); base; base = base->next) { + for (Base *base = FIRSTBASE(view_layer); base; base = base->next) { /*Only proceed for mesh object in same layer */ if (base->object->type == OB_MESH) { ob = base->object; @@ -979,7 +979,7 @@ static void free_softbody_intern(SoftBody *sb) /** * \note group overrides scene when not NULL. */ -static bool are_there_deflectors(ViewLayer *sl, Group *group) +static bool are_there_deflectors(ViewLayer *view_layer, Group *group) { if (group) { for (GroupObject *go = group->gobject.first; go; go = go->next) { @@ -988,7 +988,7 @@ static bool are_there_deflectors(ViewLayer *sl, Group *group) } } else { - for (Base *base = FIRSTBASE(sl); base; base = base->next) { + for (Base *base = FIRSTBASE(view_layer); base; base = base->next) { if (base->object->pd) { if (base->object->pd->deflect) return 1; @@ -999,9 +999,9 @@ static bool are_there_deflectors(ViewLayer *sl, Group *group) return 0; } -static int query_external_colliders(ViewLayer *sl, Group *group) +static int query_external_colliders(ViewLayer *view_layer, Group *group) { - return(are_there_deflectors(sl, group)); + return(are_there_deflectors(view_layer, group)); } /* --- dependency information functions*/ |