diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-06-02 08:39:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-02 08:39:29 +0300 |
| commit | eae486f5e6c79b7b31e276dfaea69d2ece7fbf7f (patch) | |
| tree | dd8220e52333289fa538925a95367ae47a793e3d /source/blender/alembic | |
| parent | cb23927c9b24d5b17e35c8682060cd6839337a12 (diff) | |
| parent | 0d8bf4bf947d84cdfc6e2b221ddb03c7f8d2114b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/alembic')
| -rw-r--r-- | source/blender/alembic/intern/abc_exporter.cc | 2 | ||||
| -rw-r--r-- | source/blender/alembic/intern/abc_util.cc | 4 | ||||
| -rw-r--r-- | source/blender/alembic/intern/alembic_capi.cc | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc index 59a4cb082df..e3dd2b968be 100644 --- a/source/blender/alembic/intern/abc_exporter.cc +++ b/source/blender/alembic/intern/abc_exporter.cc @@ -432,7 +432,7 @@ AbcTransformWriter * AbcExporter::createTransformWriter(Object *ob, Object *pare /* check if we have already created a transform writer for this object */ AbcTransformWriter *my_writer = getXForm(name); - if (my_writer != NULL){ + if (my_writer != NULL) { return my_writer; } diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/alembic/intern/abc_util.cc index 24f77ad3a05..8601dff54ed 100644 --- a/source/blender/alembic/intern/abc_util.cc +++ b/source/blender/alembic/intern/abc_util.cc @@ -130,7 +130,7 @@ void create_swapped_rotation_matrix( float rz; /* Apply transformation */ - switch(mode) { + switch (mode) { case ABC_ZUP_FROM_YUP: ry = -euler[2]; rz = euler[1]; @@ -205,7 +205,7 @@ void copy_m44_axis_swap(float dst_mat[4][4], float src_mat[4][4], AbcAxisSwapMod copy_m4_m3(dst_mat, dst_rot); /* Apply translation */ - switch(mode) { + switch (mode) { case ABC_ZUP_FROM_YUP: copy_zup_from_yup(dst_mat[3], src_trans); break; diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc index 3cad132b7be..54b49330355 100644 --- a/source/blender/alembic/intern/alembic_capi.cc +++ b/source/blender/alembic/intern/alembic_capi.cc @@ -470,7 +470,8 @@ static std::pair<bool, AbcObjectReader *> visit_object( else { if (child_claims_this_object) { claiming_child_readers.push_back(child_reader); - } else { + } + else { nonclaiming_child_readers.push_back(child_reader); } } |