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/editors/interface/interface_templates.c | |
parent | 77b61b554ca10353b408645e3316e06c8d240388 (diff) | |
parent | 1e4b612d6a63ce781f229ddd6e3073a5d6951950 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/interface_templates.c')
-rw-r--r-- | source/blender/editors/interface/interface_templates.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 871d2df1e85..94379ee1185 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -36,7 +36,7 @@ #include "DNA_node_types.h" #include "DNA_scene_types.h" #include "DNA_object_types.h" -#include "DNA_object_force.h" +#include "DNA_object_force_types.h" #include "DNA_brush_types.h" #include "DNA_texture_types.h" |