diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-08 16:35:14 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-08 16:35:14 +0400 |
| commit | ec33687d6cf74775e37fdc1a14e22dea08289cb1 (patch) | |
| tree | a98875cf3deae05c46cdd70192858b8844ab1ea4 /source/blender/blenlib | |
| parent | 724746dba2deed8e336fc66b36bfc3b5b1858a8e (diff) | |
| parent | 7b9adab594d1cc670d642b56ae8d76069ce91107 (diff) | |
Merged changes in the trunk up to revision 52815.
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/bpath.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 7be636fe150..4a27036050e 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -129,6 +129,7 @@ set(SRC BLI_math_color.h BLI_math_geom.h BLI_math_inline.h + BLI_math_interp.h BLI_math_matrix.h BLI_math_rotation.h BLI_math_vector.h diff --git a/source/blender/blenlib/intern/bpath.c b/source/blender/blenlib/intern/bpath.c index 8b63a94951d..8924d03f736 100644 --- a/source/blender/blenlib/intern/bpath.c +++ b/source/blender/blenlib/intern/bpath.c @@ -501,7 +501,7 @@ void BLI_bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int Material *ma = (Material *)id; bNodeTree *ntree = ma->nodetree; - if(ntree) { + if (ntree) { bNode *node; for (node = ntree->nodes.first; node; node = node->next) { |