diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-31 19:10:52 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-31 19:10:52 +0300 |
| commit | 806a338090bb2bfd706abb35bd09af0133e9e8fc (patch) | |
| tree | 34d457f336dc4296f6c999bd11296dde01e890ea /source/blender/blenkernel/intern/particle_system.c | |
| parent | 3c0e15c81aec6eb9dee91befde48d36d30edeacd (diff) | |
| parent | c8b831d742b064c44f7a4c1a208b57dae06fa0a9 (diff) | |
Merge branch 'cycles_point_density' into gooseberry
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index b32498b98ea..1d92c15e6c4 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -4491,4 +4491,3 @@ void particle_system_update(Scene *scene, Object *ob, ParticleSystem *psys) if (psys->renderdata==0) invert_m4_m4(psys->imat, ob->obmat); } - |