[Bf-blender-cvs] [1da0fe0b3b8] temp-sybren-alembic: Merge branch 'master' into temp-sybren-alembic
Sybren A. Stüvel
noreply at git.blender.org
Tue Apr 4 14:09:28 CEST 2017
Commit: 1da0fe0b3b8a6901b25523918bb71c6383aa48f3
Author: Sybren A. Stüvel
Date: Tue Apr 4 13:04:11 2017 +0200
Branches: temp-sybren-alembic
https://developer.blender.org/rB1da0fe0b3b8a6901b25523918bb71c6383aa48f3
Merge branch 'master' into temp-sybren-alembic
===================================================================
===================================================================
diff --cc source/blender/alembic/intern/abc_util.cc
index 82325fb6e1a,50fa43a3491..ed64945626b
--- a/source/blender/alembic/intern/abc_util.cc
+++ b/source/blender/alembic/intern/abc_util.cc
@@@ -37,9 -37,11 +37,11 @@@ extern "C"
#include "DNA_object_types.h"
#include "BLI_math.h"
+
+ #include "PIL_time.h"
}
-std::string get_id_name(Object *ob)
+std::string get_id_name(const Object * const ob)
{
if (!ob) {
return "";
diff --cc source/blender/alembic/intern/abc_util.h
index efaba5da2f1,85ba4d5c9c7..26c0f2eda8a
--- a/source/blender/alembic/intern/abc_util.h
+++ b/source/blender/alembic/intern/abc_util.h
@@@ -142,19 -141,28 +142,38 @@@ ABC_INLINE void copy_yup_from_zup(floa
ABC_INLINE void copy_yup_from_zup(short yup[3], const short zup[3])
{
+ const short old_zup1 = zup[1]; /* in case yup == zup */
yup[0] = zup[0];
yup[1] = zup[2];
- yup[2] = -zup[1];
+ yup[2] = -old_zup1;
}
+/* Names are given in (dst, src) order, just like
+ * the parameters of copy_m44_axis_swap() */
+typedef enum {
+ ABC_ZUP_FROM_YUP = 1,
+ ABC_YUP_FROM_ZUP = 2,
+} AbcAxisSwapMode;
+
+void copy_m44_axis_swap(float dst_mat[4][4], float src_mat[4][4], AbcAxisSwapMode mode);
+
+ /* *************************** */
+
+ #undef ABC_DEBUG_TIME
+
+ class ScopeTimer {
+ const char *m_message;
+ double m_start;
+
+ public:
+ ScopeTimer(const char *message);
+ ~ScopeTimer();
+ };
+
+ #ifdef ABC_DEBUG_TIME
+ # define SCOPE_TIMER(message) ScopeTimer prof(message)
+ #else
+ # define SCOPE_TIMER(message)
+ #endif
+
#endif /* __ABC_UTIL_H__ */
More information about the Bf-blender-cvs
mailing list