yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3840
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Sat 2014-03-15 16:30:36 +0100
message:
  Check, whether manipulatedFrame exist, if not - create it.
  
  Fixes segfault with new qglviewer
modified:
  gui/qt4/GLViewerMouse.cpp


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'gui/qt4/GLViewerMouse.cpp'
--- gui/qt4/GLViewerMouse.cpp	2014-03-08 21:19:02 +0000
+++ gui/qt4/GLViewerMouse.cpp	2014-03-15 15:30:36 +0000
@@ -40,7 +40,8 @@
   setWheelBinding(Qt::NoModifier, CAMERA, ZOOM);
 
 #if QGLVIEWER_VERSION>=0x020500
-  manipulatedFrame()->setWheelSensitivity(-1.0f);
+	if(manipulatedFrame()==0) setManipulatedFrame(new qglviewer::ManipulatedFrame());
+  manipulatedFrame()->setWheelSensitivity(-1.0);
   setMouseBinding(Qt::ShiftModifier, Qt::LeftButton, SELECT);
   
   setMouseBinding(Qt::ShiftModifier, Qt::LeftButton, FRAME, ZOOM);