Diffusion Step e94bf9b773c5

Merge branch 'release/19.12'

Authored by yurchor on Nov 19 2019, 7:17 PM.

Description

Merge branch 'release/19.12'

Details

Committed
yurchorNov 19 2019, 7:17 PM
Parents
R341:ee594e51126d: Add softbody to the resources
R341:18c407908609: Resolved merge conflict.
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
ee594e51126dyurchor
Add softbody to the resources 
Nov 19 2019