diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2015-09-24 18:24:20 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2015-09-24 18:24:20 +0300 |
| commit | 27b3ea622f8bd313a8e2827dfec752bf2125566c (patch) | |
| tree | f212e49d224ce8e1cfc3b17a64ae524711494391 /extern/libmv/libmv-capi.h | |
| parent | 372dff8d1dc7e24d4b2cd37de245588ecfce8bfa (diff) | |
| parent | de80e687689032cb85179a1f7e89750573631d5d (diff) | |
Merge remote-tracking branch 'origin/master' into cycles_camera_nodescycles_camera_nodes
Note: the branch currently crashes in blender_camera_nodes.cpp:
BL::NodeTree b_ntree = b_data.node_groups[nodes_tree_name];
The crash was introduced in:
cb7cf523e5c000609f32a382e2c0fcc57f635a42
Conflicts:
intern/cycles/SConscript
intern/cycles/blender/addon/__init__.py
intern/cycles/blender/addon/properties.py
intern/cycles/blender/blender_camera.cpp
intern/cycles/kernel/kernel_types.h
intern/cycles/kernel/svm/svm.h
intern/cycles/kernel/svm/svm_types.h
intern/cycles/render/camera.cpp
intern/cycles/render/camera.h
Diffstat (limited to 'extern/libmv/libmv-capi.h')
| -rw-r--r-- | extern/libmv/libmv-capi.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/extern/libmv/libmv-capi.h b/extern/libmv/libmv-capi.h index 524f1822bc7..92e206a19b2 100644 --- a/extern/libmv/libmv-capi.h +++ b/extern/libmv/libmv-capi.h @@ -27,13 +27,16 @@ #ifndef LIBMV_C_API_H #define LIBMV_C_API_H +#include "intern/autotrack.h" #include "intern/camera_intrinsics.h" #include "intern/detector.h" +#include "intern/frame_accessor.h" #include "intern/homography.h" #include "intern/image.h" #include "intern/logging.h" #include "intern/reconstruction.h" #include "intern/track_region.h" #include "intern/tracks.h" +#include "intern/tracksN.h" #endif // LIBMV_C_API_H |