diff options
| author | Adam NAILI | 2017-12-27 17:19:23 +0100 |
|---|---|---|
| committer | Adam NAILI | 2017-12-27 17:19:23 +0100 |
| commit | f39e6e3be66ff6077dd83094850232a46a21e624 (patch) | |
| tree | b201d6718cd2c550b4ba5ff8e12b084a7171f0c5 /include/blender/blender.h | |
| parent | ee98053ef83869033713c8c7d6d487457d6443d8 (diff) | |
| parent | f5ff85f3c7e7d6bf11a423c497d2b3ce76cfafd8 (diff) | |
| download | morpher-f39e6e3be66ff6077dd83094850232a46a21e624.tar.gz | |
Merge remote-tracking branch 'origin/master' into gui
Diffstat (limited to 'include/blender/blender.h')
| -rw-r--r-- | include/blender/blender.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/blender/blender.h b/include/blender/blender.h index 8e89208..26ff802 100644 --- a/include/blender/blender.h +++ b/include/blender/blender.h | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include "common/time.h" | 9 | #include "common/time.h" |
| 10 | #include "blender/canvas.h" | 10 | #include "blender/canvas.h" |
| 11 | #include "morpher/morpher.h" | 11 | #include "morpher/morphing.h" |
| 12 | 12 | ||
| 13 | /** | 13 | /** |
| 14 | * Function: blender_blend_canvas | 14 | * Function: blender_blend_canvas |