Skip to content

Commit

Permalink
Merge pull request #119 from Astroua/develop
Browse files Browse the repository at this point in the history
Fixed broken compile on Mac OS X
  • Loading branch information
alexstrilets committed Dec 7, 2015
2 parents e2d4075 + 14b6e7b commit fe205ed
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion carta/cpp/core/ScriptedClient/ScriptFacade.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include "Data/Image/Contour/ContourControls.h"

#include <QDebug>
#include <cmath>

using Carta::State::ObjectManager;
//using Carta::State::CartaObject;
Expand Down Expand Up @@ -328,7 +329,7 @@ QStringList ScriptFacade::showImageAnimator( const QString& animatorId ){
if ( obj != nullptr ){
Carta::Data::Animator* animator = dynamic_cast<Carta::Data::Animator*>(obj);
if ( animator != nullptr){
QString animId;
QString animId;
animator->addAnimator( "Image", animId );
}
else {
Expand Down

0 comments on commit fe205ed

Please sign in to comment.