diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2020-01-21 21:57:57 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2020-01-21 22:10:02 +0300 |
| commit | 367d60dab13723a5a2d7a5336af0efa64b3c446d (patch) | |
| tree | f984516802ec6948f8b1dd0a52c78b50d4dc3d4e /source/blender/blenkernel/intern/softbody.c | |
| parent | 6c50e82efb3e46ef0a2a1b63bd4e1c8a64d559d0 (diff) | |
Make ED_object_modifier_add() accept NULL scene parameter.
This data is only used to get current time/frame value, which is never
mandatory to add a modifier.
Needed by incoming fix to support particles modifiers in liboverrides.
Diffstat (limited to 'source/blender/blenkernel/intern/softbody.c')
| -rw-r--r-- | source/blender/blenkernel/intern/softbody.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index b56403dfb6d..3bbd909800b 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -3132,8 +3132,10 @@ SoftBody *sbNew(Scene *scene) sb->inpush = 0.5f; sb->interval = 10; - sb->sfra = scene->r.sfra; - sb->efra = scene->r.efra; + if (scene != NULL) { + sb->sfra = scene->r.sfra; + sb->efra = scene->r.efra; + } sb->colball = 0.49f; sb->balldamp = 0.50f; |