diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2018-05-01 18:03:20 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2018-05-01 18:03:20 +0300 |
| commit | bbfee34e9e2a3d8e8572dd41b3601e783d35a675 (patch) | |
| tree | fbb36728165d9c4ea8b60e0cac340652dbc7e30d /intern/cycles/render/particles.h | |
| parent | ae7b67902191abb7e5aefbdcc20b84f050ec2b08 (diff) | |
| parent | 2e98524b58a53f0d546e5f1e7d549d2f45815055 (diff) | |
Merge remote-tracking branch 'origin/master' into uv_unwrapping_slim_algorithm
Diffstat (limited to 'intern/cycles/render/particles.h')
| -rw-r--r-- | intern/cycles/render/particles.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/render/particles.h b/intern/cycles/render/particles.h index 2509e27b44b..66d46114b3e 100644 --- a/intern/cycles/render/particles.h +++ b/intern/cycles/render/particles.h @@ -17,8 +17,8 @@ #ifndef __PARTICLES_H__ #define __PARTICLES_H__ -#include "util_types.h" -#include "util_vector.h" +#include "util/util_types.h" +#include "util/util_vector.h" CCL_NAMESPACE_BEGIN |