projects
/
blender-staging.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
svn merge -r 12937:13095 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git]
/
source
/
blender
/
blenkernel
/
intern
/
softbody.c
diff --git
a/source/blender/blenkernel/intern/softbody.c
b/source/blender/blenkernel/intern/softbody.c
index fdc03a8823052ab8833c240c9d2d248796658c89..f2258f0e1c42f5610ad64c4dbe361072f5f5170f 100644
(file)
--- a/
source/blender/blenkernel/intern/softbody.c
+++ b/
source/blender/blenkernel/intern/softbody.c
@@
-778,7
+778,7
@@
static void calculate_collision_balls(Object *ob)
bs = sb->bspring + bp->springs[b-1];
if (bs->order == 1){
akku += bs->len;
- akku_count++
,
+ akku_count++
;
min = MIN2(bs->len,min);
max = MAX2(bs->len,max);
}