forked from bartvdbraak/blender
Merge branch 'master' into blender2.8
This commit is contained in:
commit
11e95fcdd2
@ -63,12 +63,7 @@
|
||||
#if defined(_MSC_VER)
|
||||
# define ATOMIC_INLINE static __forceinline
|
||||
#else
|
||||
# if (defined(__APPLE__) && defined(__ppc__))
|
||||
/* static inline __attribute__ here breaks osx ppc gcc42 build */
|
||||
# define ATOMIC_INLINE static __attribute__((always_inline))
|
||||
# else
|
||||
# define ATOMIC_INLINE static inline __attribute__((always_inline))
|
||||
# endif
|
||||
# define ATOMIC_INLINE static inline __attribute__((always_inline))
|
||||
#endif
|
||||
|
||||
#ifndef LIKELY
|
||||
|
@ -62,7 +62,7 @@ def main():
|
||||
# adding to our objects "life" property
|
||||
"""
|
||||
actu_collide = cont.sensors["collision_sens"]
|
||||
for ob in actu_collide.objectHitList:
|
||||
for ob in actu_collide.hitObjectList:
|
||||
# Check to see the object has this property
|
||||
if "life" in ob:
|
||||
own["life"] += ob["life"]
|
||||
|
@ -624,8 +624,17 @@ float defvert_find_weight(const struct MDeformVert *dvert, const int defgroup)
|
||||
*/
|
||||
float defvert_array_find_weight_safe(const struct MDeformVert *dvert, const int index, const int defgroup)
|
||||
{
|
||||
if (defgroup == -1 || dvert == NULL)
|
||||
/* Invalid defgroup index means the vgroup selected is invalid, does not exist, in that case it is OK to return 1.0
|
||||
* (i.e. maximum weight, as if no vgroup was selected).
|
||||
* But in case of valid defgroup and NULL dvert data pointer, it means that vgroup **is** valid,
|
||||
* and just totally empty, so we shall return '0.0' value then!
|
||||
*/
|
||||
if (defgroup == -1) {
|
||||
return 1.0f;
|
||||
}
|
||||
else if (dvert == NULL) {
|
||||
return 0.0f;
|
||||
}
|
||||
|
||||
return defvert_find_weight(dvert + index, defgroup);
|
||||
}
|
||||
|
@ -48,12 +48,7 @@ extern "C++" {
|
||||
#if defined(_MSC_VER)
|
||||
# define BLI_INLINE static __forceinline
|
||||
#else
|
||||
# if (defined(__APPLE__) && defined(__ppc__))
|
||||
/* static inline __attribute__ here breaks osx ppc gcc42 build */
|
||||
# define BLI_INLINE static __attribute__((always_inline)) __attribute__((__unused__))
|
||||
# else
|
||||
# define BLI_INLINE static inline __attribute__((always_inline)) __attribute__((__unused__))
|
||||
# endif
|
||||
# define BLI_INLINE static inline __attribute__((always_inline)) __attribute__((__unused__))
|
||||
#endif
|
||||
|
||||
#endif /* __BLI_COMPILER_COMPAT_H__ */
|
||||
|
@ -44,12 +44,7 @@ extern "C" {
|
||||
# define MALWAYS_INLINE MINLINE
|
||||
# else
|
||||
# define MINLINE static inline
|
||||
# if (defined(__APPLE__) && defined(__ppc__))
|
||||
/* static inline __attribute__ here breaks osx ppc gcc42 build */
|
||||
# define MALWAYS_INLINE static __attribute__((always_inline)) __attribute__((unused))
|
||||
# else
|
||||
# define MALWAYS_INLINE static inline __attribute__((always_inline)) __attribute__((unused))
|
||||
# endif
|
||||
# define MALWAYS_INLINE static inline __attribute__((always_inline)) __attribute__((unused))
|
||||
# endif
|
||||
#else
|
||||
# define MINLINE
|
||||
|
@ -281,7 +281,7 @@ int KX_FontObject::pyattr_set_text(void *self_v, const KX_PYATTRIBUTE_DEF *attrd
|
||||
KX_FontObject* self = static_cast<KX_FontObject*>(self_v);
|
||||
if (!PyUnicode_Check(value))
|
||||
return PY_SET_ATTR_FAIL;
|
||||
char* chars = _PyUnicode_AsString(value);
|
||||
const char *chars = _PyUnicode_AsString(value);
|
||||
|
||||
/* Allow for some logic brick control */
|
||||
CValue* tprop = self->GetProperty("Text");
|
||||
|
Loading…
Reference in New Issue
Block a user