diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-02-07 03:18:50 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-07 03:19:01 +0300 |
commit | 17577c53c672dcc8d5493324c4bcb970db455f2a (patch) | |
tree | 575d227e936e1653ef200c464a28a9e4453c14dd /source/blender/draw | |
parent | 77b61b554ca10353b408645e3316e06c8d240388 (diff) | |
parent | 1e4b612d6a63ce781f229ddd6e3073a5d6951950 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/draw')
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_depth_of_field.c | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee/eevee_volumes.c | 2 | ||||
-rw-r--r-- | source/blender/draw/modes/object_mode.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_depth_of_field.c b/source/blender/draw/engines/eevee/eevee_depth_of_field.c index f5fc79aba4f..dcd45e27337 100644 --- a/source/blender/draw/engines/eevee/eevee_depth_of_field.c +++ b/source/blender/draw/engines/eevee/eevee_depth_of_field.c @@ -32,7 +32,7 @@ #include "DNA_anim_types.h" #include "DNA_camera_types.h" -#include "DNA_object_force.h" +#include "DNA_object_force_types.h" #include "DNA_screen_types.h" #include "DNA_view3d_types.h" #include "DNA_world_types.h" diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c index 3c538c945e8..2c5b9072837 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.c +++ b/source/blender/draw/engines/eevee/eevee_volumes.c @@ -30,7 +30,7 @@ #include "BLI_rand.h" #include "BLI_string_utils.h" -#include "DNA_object_force.h" +#include "DNA_object_force_types.h" #include "DNA_smoke_types.h" #include "DNA_world_types.h" diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index b1e0eddfc46..e807be34633 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -32,7 +32,7 @@ #include "DNA_curve_types.h" #include "DNA_mesh_types.h" #include "DNA_meta_types.h" -#include "DNA_object_force.h" +#include "DNA_object_force_types.h" #include "DNA_lightprobe_types.h" #include "DNA_particle_types.h" #include "DNA_view3d_types.h" |