Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@stuvel.eu>2017-04-14 19:20:24 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2017-04-14 19:20:28 +0300
commit5fa4f397c2050fa15e28855acae1520377a4a517 (patch)
treef0f1afb37f20ba39c90d4c59b4cb7c9abf92d73a /source/blender/alembic/intern/abc_util.h
parent4d117f2fd2438989d90b40f38d2ca1625be9e6e0 (diff)
Alembic import: fixed dupligroup export when the dupli-empty has a parent
Diffstat (limited to 'source/blender/alembic/intern/abc_util.h')
-rw-r--r--source/blender/alembic/intern/abc_util.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/alembic/intern/abc_util.h b/source/blender/alembic/intern/abc_util.h
index 7bde9ac6e15..74d0faf97d3 100644
--- a/source/blender/alembic/intern/abc_util.h
+++ b/source/blender/alembic/intern/abc_util.h
@@ -62,7 +62,8 @@ typedef enum {
ABC_MATRIX_WORLD = 1,
ABC_MATRIX_LOCAL = 2,
} AbcMatrixMode;
-void create_transform_matrix(Object *obj, float r_transform_mat[4][4], AbcMatrixMode mode);
+void create_transform_matrix(Object *obj, float r_transform_mat[4][4],
+ AbcMatrixMode mode, Object *proxy_from);
void split(const std::string &s, const char delim, std::vector<std::string> &tokens);