diff --git a/panda/src/pgraph/loaderFileTypeRegistry.cxx b/panda/src/pgraph/loaderFileTypeRegistry.cxx index cc5ebf6add..9e1682cfae 100644 --- a/panda/src/pgraph/loaderFileTypeRegistry.cxx +++ b/panda/src/pgraph/loaderFileTypeRegistry.cxx @@ -107,11 +107,12 @@ get_type_from_extension(const string &extension) { _deferred_types.erase(di); loader_cat->info() - << "loading file type module: " << dlname.to_os_specific() << endl; + << "loading file type module: " << (*di).second << endl; void *tmp = load_dso(dlname); if (tmp == (void *)NULL) { - loader_cat->info() - << "Unable to load: " << load_dso_error() << endl; + loader_cat->warning() + << "Unable to load " << dlname.to_os_specific() << ": " + << load_dso_error() << endl; return NULL; } diff --git a/panda/src/pgraph/nodePath.I b/panda/src/pgraph/nodePath.I index a9943eb504..12a23ec683 100644 --- a/panda/src/pgraph/nodePath.I +++ b/panda/src/pgraph/nodePath.I @@ -794,6 +794,17 @@ get_r(const NodePath &other) const { return get_hpr(other)[2]; } +//////////////////////////////////////////////////////////////////// +// Function: NodePath::set_scale +// Access: Published +// Description: Sets the scale component of the transform, +// relative to the other node. +//////////////////////////////////////////////////////////////////// +INLINE void NodePath:: +set_scale(const NodePath &other, float scale) { + set_scale(other, LPoint3f(scale, scale, scale)); +} + //////////////////////////////////////////////////////////////////// // Function: NodePath::set_scale // Access: Published diff --git a/panda/src/pgraph/nodePath.h b/panda/src/pgraph/nodePath.h index 5e881dc739..ba5a0f0d7f 100644 --- a/panda/src/pgraph/nodePath.h +++ b/panda/src/pgraph/nodePath.h @@ -369,6 +369,7 @@ PUBLISHED: void set_quat(const NodePath &other, const LQuaternionf &quat); LQuaternionf get_quat(const NodePath &other) const; + INLINE void set_scale(const NodePath &other, float scale); INLINE void set_scale(const NodePath &other, float sx, float sy, float sz); void set_scale(const NodePath &other, const LVecBase3f &scale); void set_sx(const NodePath &other, float sx);