Merged branch 'feature08_assistants' by blackwarthog with conflicts resolved

Author: manongjohn

toonz/sources/include/tgeometry.h

@@ -634,14 +634,14 @@ TRectI  is empty if x0>x1 || y0>y1 */
   TPointT<T> getP11() const { return TPointT<T>(x1, y1); };
 
   //! Returns the union of two source rectangles.
-  //!The union is the smallest rectangle that contains both source rectangles.
+  //! The union is the smallest rectangle that contains both source rectangles.
   TRectT<T> operator+(const TRectT<T> &rect) const {  // unione
     if (isEmpty())
       return rect;
     else if (rect.isEmpty())
       return *this;
     else
-      return TRectT<T>(std::min((T)x0, (T)rect.x0), 
+      return TRectT<T>(std::min((T)x0, (T)rect.x0),
                        std::min((T)y0, (T)rect.y0),
                        std::max((T)x1, (T)rect.x1),
                        std::max((T)y1, (T)rect.y1));
@@ -653,8 +653,8 @@ TRectI  is empty if x0>x1 || y0>y1 */
     return *this = *this * rect;
   };
 
-  //!Returns the intersection of two existing rectangles.
-  //The intersection is the largest rectangle contained in both existing rectangles.
+  //! Returns the intersection of two existing rectangles.
+  //! The intersection is the largest rectangle contained in both existing rectangles.
   TRectT<T> operator*(const TRectT<T> &rect) const {  // intersezione
     if (isEmpty() || rect.isEmpty())
       return TRectT<T>();
@@ -735,7 +735,6 @@ template class DVAPI TRectT<double>;
 \relates TRectT
 Convert a TRectD into a TRect
 */
-
 inline TRect convert(const TRectD &r) {
   return TRect((int)(r.x0 + 0.5), (int)(r.y0 + 0.5), (int)(r.x1 + 0.5),
                (int)(r.y1 + 0.5));
@@ -752,8 +751,8 @@ inline TRectD convert(const TRect &r) { return TRectD(r.x0, r.y0, r.x1, r.y1); }
 \relates TPointT
 */
 inline TRectD boundingBox(const TPointD &p0, const TPointD &p1) {
-  return TRectD(std::min(p0.x, p1.x), std::min(p0.y, p1.y),  // bottom left
-                std::max(p0.x, p1.x), std::max(p0.y, p1.y));  // top right
+  return TRectD(std::min(p0.x, p1.x), std::min(p0.y, p1.y), // bottom left
+                std::max(p0.x, p1.x), std::max(p0.y, p1.y)); // top right
 }
 /*!
 \relates TRectT
@@ -800,8 +799,6 @@ inline void TRectT<int>::empty() {
   x0 = y0 = 0;
   x1 = y1 = -1;
 }
-
-// Is the adding of one here to account for the thickness?
 template <>
 inline int TRectT<int>::getLx() const {
   return x1 >= x0 ? x1 - x0 + 1 : 0;
@@ -894,9 +891,9 @@ extern DVVAR const TRectI infiniteRectI;
 //=============================================================================
 //! This is the base class for the affine transformations.
 /*!
- This class performs basic manipulations of affine transformations.
- An affine transformation is a linear transformation followed by a translation.
- 
+  This class performs basic manipulations of affine transformations.
+  An affine transformation is a linear transformation followed by a translation.
+
   [a11, a12, a13]
   [a21, a22, a23]
 

toonz/sources/tnztools/inputmanager.cpp

@@ -757,7 +757,7 @@ void TInputManager::draw() {
   TToolViewer *viewer = getViewer();
 
   // paint not sent sub-tracks
-  if (debugInputManagerTracks || m_savePointsSent < (int)m_savePoints.size()) {
+  if (debugInputManagerTracks /* || m_savePointsSent < (int)m_savePoints.size() */) {
     glPushAttrib(GL_ALL_ATTRIB_BITS);
     tglEnableBlending();
     tglEnableLineSmooth(true, 0.5);

toonz/sources/tnztools/plastictool.cpp

@@ -642,7 +642,7 @@ PlasticTool::PlasticTool()
     , m_showSkeletonOS(true)
     , m_recompileOnMouseRelease(false) {
   // And now, a little trick about tool binding
-  bind(TTool::AllImages);   // Attach the tool to all types :)
+  bind(TTool::AllImages | TTool::EmptyTarget);   // Attach the tool to all types :)
   bind(TTool::MeshLevels);  // But disable it for all but meshes :0
 
   // This little trick is needed to associate the tool to common levels (the

toonz/sources/tnztools/toonzrasterbrushtool.cpp

@@ -1135,7 +1135,7 @@ void ToonzRasterBrushTool::leftButtonDown(const TPointD &pos,
       m_tileSaver->save(m_rasterTrack->getLastRect());
       m_rasterTrack->generateLastPieceOfStroke(m_pencil.getValue());
 
-      m_smoothStroke.beginStroke(4*m_smooth.getValue());
+      m_smoothStroke.beginStroke(m_smooth.getValue());
       m_smoothStroke.points().clear();
       m_smoothStroke.addPoint(thickPoint);
     } else {
@@ -1155,7 +1155,7 @@ void ToonzRasterBrushTool::leftButtonDown(const TPointD &pos,
                                    m_styleId, drawOrder);
       m_lastRect = m_strokeRect;
 
-      m_smoothStroke.beginStroke(4*m_smooth.getValue());
+      m_smoothStroke.beginStroke(m_smooth.getValue());
       m_smoothStroke.points().clear();
       m_smoothStroke.addPoint(point);
     }

toonz/sources/tnztools/toonzvectorbrushtool.cpp

@@ -728,7 +728,7 @@ void ToonzVectorBrushTool::leftButtonDown(const TPointD &pos,
   if (m_pressure.getValue() && e.m_pressure == 1.0)
     thickness = m_thickness.getValue().first * 0.5;
   m_currThickness = thickness;
-  m_smoothStroke.beginStroke(4*m_smooth.getValue());
+  m_smoothStroke.beginStroke(m_smooth.getValue());
 
   if (m_foundFirstSnap) {
     addTrackPoint(TThickPoint(m_firstSnapPoint, thickness),

toonz/sources/toonz/viewerpane.cpp

@@ -351,6 +351,8 @@ void SceneViewerPanel::showEvent(QShowEvent *event) {
 
   assert(ret);
 
+  m_sceneViewer->onToolSwitched();
+
   // Aggiorno FPS al valore definito nel viewer corrente.
   // frameHandle->setPreviewFrameRate(m_fpsSlider->value());
   m_flipConsole->setActive(true);

toonz/sources/toonzlib/toonzscene.cpp

@@ -1047,8 +1047,7 @@ static LevelType getLevelType(const TFilePath &fp) {
   case TFileType::META_IMAGE:
   case TFileType::META_LEVEL:
     ret.m_ltype = META_XSHLEVEL;
-    break;
- 
+
   default:
     break;
   }