Skip to content

Commit

Permalink
Merge branch 'feature/more-precise-items-visibility' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
lo48576 committed Apr 21, 2019
2 parents 33d9ac3 + af749af commit e83f2e8
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/low/v7400.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

pub use self::{
array_attribute::ArrayAttributeEncoding,
attribute::{AttributeType, AttributeValue},
attribute::{type_::AttributeType, value::AttributeValue},
fbx_footer::FbxFooter,
};
pub(crate) use self::{
Expand Down
6 changes: 2 additions & 4 deletions src/low/v7400/attribute.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
//! Node attribute.

pub use self::{type_::AttributeType, value::AttributeValue};

mod type_;
mod value;
pub(crate) mod type_;
pub(crate) mod value;
2 changes: 1 addition & 1 deletion src/tree/v7400.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use self::node::{NodeData, NodeNameSym};
pub use self::{
error::LoadError,
loader::Loader,
node::{NodeHandle, NodeId},
node::{handle::NodeHandle, NodeId},
};

mod error;
Expand Down
5 changes: 2 additions & 3 deletions src/tree/v7400/node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@

use indextree;

use crate::tree::v7400::Tree;
use crate::tree::v7400::{NodeHandle, Tree};

pub use self::handle::NodeHandle;
pub(crate) use self::{data::NodeData, name::NodeNameSym};

mod data;
mod handle;
pub(crate) mod handle;
mod name;

/// Node ID in FBX data tree.
Expand Down

0 comments on commit e83f2e8

Please sign in to comment.