|
@@ -170,7 +170,6 @@ namespace igl
|
|
#include "project.h"
|
|
#include "project.h"
|
|
#include "../forward_kinematics.h"
|
|
#include "../forward_kinematics.h"
|
|
#include "../matlab_format.h"
|
|
#include "../matlab_format.h"
|
|
-#include "../any_of.h"
|
|
|
|
#include <iostream>
|
|
#include <iostream>
|
|
#include <algorithm>
|
|
#include <algorithm>
|
|
#include <functional>
|
|
#include <functional>
|
|
@@ -522,7 +521,7 @@ inline void igl::opengl2::MouseController::set_selection(
|
|
}
|
|
}
|
|
|
|
|
|
// Now selection should contain just bone roots of m_selection subtrees
|
|
// Now selection should contain just bone roots of m_selection subtrees
|
|
- if(any_of(m_selection))
|
|
|
|
|
|
+ if(m_selection.array().any())
|
|
{
|
|
{
|
|
// Taking average
|
|
// Taking average
|
|
Vector3d avg_pos(0,0,0);
|
|
Vector3d avg_pos(0,0,0);
|
|
@@ -673,7 +672,7 @@ inline void igl::opengl2::MouseController::clear_selection()
|
|
|
|
|
|
inline bool igl::opengl2::MouseController::any_selection() const
|
|
inline bool igl::opengl2::MouseController::any_selection() const
|
|
{
|
|
{
|
|
- return igl::any_of(m_selection);
|
|
|
|
|
|
+ return m_selection.array().any();
|
|
}
|
|
}
|
|
|
|
|
|
inline void igl::opengl2::MouseController::set_widget_mode(const WidgetMode & mode)
|
|
inline void igl::opengl2::MouseController::set_widget_mode(const WidgetMode & mode)
|