← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libavogadro/src/engine.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/engine.cpp
338
338
 
339
339
  void Engine::useCustomPrimitives()
340
340
  {
 
341
    if(!m_molecule)
 
342
      return;
 
343
 
341
344
    m_customPrims = true;
342
345
    m_atoms = m_molecule->atoms();
343
346
    m_bonds = m_molecule->bonds();