projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel/master' into tizen
[platform/core/uifw/dali-toolkit.git]
/
dali-scene3d
/
public-api
/
loader
/
skinning-details.h
diff --git
a/dali-scene3d/public-api/loader/skinning-details.h
b/dali-scene3d/public-api/loader/skinning-details.h
index
59f778a
..
7752219
100644
(file)
--- a/
dali-scene3d/public-api/loader/skinning-details.h
+++ b/
dali-scene3d/public-api/loader/skinning-details.h
@@
-18,8
+18,8
@@
*/
// EXTERNAL INCLUDES
*/
// EXTERNAL INCLUDES
-#include <dali/public-api/rendering/shader.h>
#include <dali/public-api/animation/constraint.h>
#include <dali/public-api/animation/constraint.h>
+#include <dali/public-api/rendering/shader.h>
#include <string>
// INTERNAL INCLUDES
#include <string>
// INTERNAL INCLUDES
@@
-41,13
+41,15
@@
public:
Matrix inverseMatrix;
};
Matrix inverseMatrix;
};
- /*
+ /*
*
* @brief Upper limit on the number of joints supported.
* @brief Upper limit on the number of joints supported.
+ * @SINCE_2_0.7
*/
static const uint32_t MAX_JOINTS;
*/
static const uint32_t MAX_JOINTS;
- /*
+ /*
*
* @brief Name of bone matrix uniform (array).
* @brief Name of bone matrix uniform (array).
+ * @SINCE_2_0.7
*/
static const char* BONE_UNIFORM_NAME;
*/
static const char* BONE_UNIFORM_NAME;