← Back to branch summary

~ubuntu-branches/ubuntu/trusty/avogadro/trusty-proposed

« back to all changes in this revision

Viewing changes to libavogadro/src/tools/drawtool.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Rohan Garg
  • Date: 2011-05-20 18:55:49 UTC
  • mfrom: (3.2.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110520185549-berzu8h9f9330xji
Tags: 1.0.3-1ubuntu1
https://launchpad.net/bugs/787458
https://launchpad.net/bugs/784267
* Merge from debian, remaining changes (LP: #787458, #784267)
  - Disable builds for ARM as build dependency on libOpenGL and 
    libQtOpenGL

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavogadro/src/tools/drawtool.cpp
507
507
                                              m_addHydrogens);
508
508
        }
509
509
      }
510
 
 
511
 
      // clean up after drawing
512
 
      m_beginAtom=0;
513
 
      m_bond=0;
514
 
      m_endAtom=0;
515
 
      m_prevBond=0;
516
 
      m_prevBondOrder=0;
517
 
      m_prevAtomElement=0;
518
 
      m_beginAtomAdded=false;
519
 
      m_endAtomAdded=false;
520
 
      m_hydrogenCommand = 0;
521
 
 
522
 
      m_forceField->UnsetIgnoreAtom();
523
 
      m_forceField->UnsetFixAtom();
524
510
    }
525
511
 
526
512
    // Either use a three-button mouse
562
548
      }
563
549
    }
564
550
 
 
551
    // clean up after drawing
 
552
    m_beginAtom=0;
 
553
    m_bond=0;
 
554
    m_endAtom=0;
 
555
    m_prevBond=0;
 
556
    m_prevBondOrder=0;
 
557
    m_prevAtomElement=0;
 
558
    m_beginAtomAdded=false;
 
559
    m_endAtomAdded=false;
 
560
    m_hydrogenCommand = 0;
 
561
 
 
562
    m_forceField->UnsetIgnoreAtom();
 
563
    m_forceField->UnsetFixAtom();
 
564
 
565
565
    molecule->lock()->unlock();
566
566
    return undo;
567
567
  }