← Back to branch summary

~georg-zotti/stellarium/gz_AtmosphereTweaks

« back to all changes in this revision

Viewing changes to src/core/modules/CustomObject.cpp

  • Committer: Georg Zotti
  • Date: 2017-05-23 13:18:09 UTC
  • mfrom: (8115.1.1321 trunk)
  • Revision ID: georg.zotti@univie.ac.at-20170523131809-a6pus0ogpmjwtmd8
merge-in trunk r9436

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/modules/CustomObject.cpp
36
36
CustomObject::CustomObject(const QString& codesignation, const Vec3d& coordinates, const bool isVisible)
37
37
        : initialized(false)
38
38
        , XYZ(coordinates)
39
 
        , markerTexture(NULL)
 
39
        , markerTexture(Q_NULLPTR)
40
40
        , designation(codesignation)
41
41
        , isMarker(isVisible)
42
42
{
125
125
        if (isMarker)
126
126
        {
127
127
                markerTexture->bind();
128
 
                float size = getAngularSize(NULL)*M_PI/180.*painter->getProjector()->getPixelPerRadAtCenter();
 
128
                float size = getAngularSize(Q_NULLPTR)*M_PI/180.*painter->getProjector()->getPixelPerRadAtCenter();
129
129
                float shift = markerSize + size/1.6f;
130
130
 
131
131
                painter->drawSprite2dMode(XYZ, markerSize);