Merge branch 'feature08_assistants' from blackwarthog

Author: manongjohn

toonz/sources/include/tgeometry.h

@@ -1259,7 +1259,12 @@ class DVAPI TAngleRangeSet {
   static double toDouble(Type a) {
     return ((double)a / (double)max - 0.5) * M_2PI;
   }
+  static List::const_iterator empty_iterator() {
+    static List list;
+    return list.end();
+  }
 
+  
   struct Range {
     Type a0, a1;
     Range() : a0(), a1() {}
@@ -1291,7 +1296,7 @@ class DVAPI TAngleRangeSet {
     inline Iterator &set(bool full) {
       m_flip    = full;
       m_lapped  = !m_flip;
-      m_current = m_prebegin = m_begin = m_end = List::const_iterator();
+      m_current = m_prebegin = m_begin = m_end = empty_iterator();
       return *this;
     }
 

toonz/sources/tnztools/fullcolorbrushtool.cpp

@@ -412,8 +412,16 @@ void FullColorBrushTool::paintTrackPoint(const TTrackPoint &point,
   TrackHandler *handler;
   if (track.size() == track.pointsAdded && !track.toolHandler && m_workRaster) {
     mypaint::Brush mypaintBrush;
-    applyToonzBrushSettings(mypaintBrush);
-    handler = new TrackHandler(m_workRaster, *this, mypaintBrush);
+    bool mypaintStyle = applyToonzBrushSettings(mypaintBrush);
+    double overridePressure = -1.0;
+    if (!m_enabledPressure && mypaintStyle) 
+      overridePressure = 0.5;
+    if (!m_enabledPressure && !mypaintStyle)
+      overridePressure = 1.0;
+    if (!track.hasPressure && !mypaintStyle)
+      overridePressure = 1.0;
+
+    handler = new TrackHandler(m_workRaster, *this, mypaintBrush, overridePressure);
     handler->brush.beginStroke();
     track.toolHandler = handler;
   }
@@ -423,7 +431,8 @@ void FullColorBrushTool::paintTrackPoint(const TTrackPoint &point,
   // paint stroke
   m_strokeSegmentRect.empty();
   handler->brush.strokeTo(point.position + rasCenter,
-                          m_enabledPressure ? point.pressure : 0.5, point.tilt,
+                          handler->overridePressure >= 0.0 ? handler->overridePressure : point.pressure,
+                          point.tilt,
                           point.time - track.previous().time);
   if (track.pointsAdded == 1 && track.finished()) handler->brush.endStroke();
 
@@ -835,7 +844,7 @@ void FullColorBrushTool::applyClassicToonzBrushSettings(
   }
 }
 
-void FullColorBrushTool::applyToonzBrushSettings(mypaint::Brush &mypaintBrush) {
+bool FullColorBrushTool::applyToonzBrushSettings(mypaint::Brush &mypaintBrush) {
   TMyPaintBrushStyle *mypaintStyle = getBrushStyle();
 
   if (mypaintStyle) {
@@ -873,9 +882,12 @@ void FullColorBrushTool::applyToonzBrushSettings(mypaint::Brush &mypaintBrush) {
       // lock-alpha already disables eraser
       mypaintBrush.setBaseValue(MYPAINT_BRUSH_SETTING_LOCK_ALPHA, 1.0);
     }
-  } else {
-    applyClassicToonzBrushSettings(mypaintBrush);
+    
+    return true;
   }
+
+  applyClassicToonzBrushSettings(mypaintBrush);
+  return false;
 }
 
 //==========================================================================================================

toonz/sources/tnztools/fullcolorbrushtool.h

@@ -34,16 +34,17 @@ class FullColorBrushTool final : public TTool, public RasterController {
   class TrackHandler : public TTrackToolHandler {
   public:
     MyPaintToonzBrush brush;
+    double overridePressure;
 
     TrackHandler(const TRaster32P &ras, RasterController &controller,
-                 const mypaint::Brush &brush)
-        : brush(ras, controller, brush) {}
+                 const mypaint::Brush &brush, double overridePressure = -1.0)
+        : brush(ras, controller, brush), overridePressure(overridePressure) {}
   };
 
 private:
   void updateCurrentStyle();
   void applyClassicToonzBrushSettings(mypaint::Brush &mypaintBrush);
-  void applyToonzBrushSettings(mypaint::Brush &mypaintBrush);
+  bool applyToonzBrushSettings(mypaint::Brush &mypaintBrush);
 
 public:
   FullColorBrushTool(std::string name);

toonz/sources/tnztools/tooloptions.cpp

@@ -2721,28 +2721,35 @@ ToolOptions::~ToolOptions() {}
 
 void ToolOptions::showEvent(QShowEvent *) {
   TTool::Application *app = TTool::getApplication();
-  ToolHandle *currTool    = app->getCurrentTool();
-  if (currTool) {
+
+  if (ToolHandle *currTool = app->getCurrentTool())
+    currTool->disconnect(this);
+  if (TObjectHandle *currObject = app->getCurrentObject())
+    currObject->disconnect(this);
+  if (TXshLevelHandle *currLevel = app->getCurrentLevel())
+    currLevel->disconnect(this);
+  
+  if (ToolHandle *currTool = app->getCurrentTool()) {
+    currTool->disconnect(this);
     onToolSwitched();
     connect(currTool, SIGNAL(toolSwitched()), SLOT(onToolSwitched()));
     connect(currTool, SIGNAL(toolOptionsBoxChanged()),
             SLOT(onToolOptionsBoxChanged()));
     connect(currTool, SIGNAL(toolChanged()), SLOT(onToolChanged()));
   }
 
-  TObjectHandle *currObject = app->getCurrentObject();
-  if (currObject) {
+  if (TObjectHandle *currObject = app->getCurrentObject()) {
+    currObject->disconnect(this);
     onStageObjectChange();
     connect(currObject, SIGNAL(objectSwitched()), SLOT(onStageObjectChange()));
     connect(currObject, SIGNAL(objectChanged(bool)),
             SLOT(onStageObjectChange()));
   }
 
-  TXshLevelHandle *currLevel = app->getCurrentLevel();
-
-  if (currLevel)
+  if (TXshLevelHandle *currLevel = app->getCurrentLevel()) {
     connect(currLevel, SIGNAL(xshLevelSwitched(TXshLevel *)), this,
             SLOT(onStageObjectChange()));
+  }
 }
 
 //-----------------------------------------------------------------------------

toonz/sources/toonz/drawingdata.cpp

@@ -304,11 +304,12 @@ bool DrawingData::getLevelFrames(TXshSimpleLevel *sl,
   }
 
   // Merge Palette :
-  TPalette *slPlt = sl->getPalette();
-  bool styleAdded = mergePalette_Overlap(slPlt, imgPlt, keepOriginalPalette);
-
+  bool styleAdded = false;
   std::map<int, int> styleTable;
-  for (int s = 0; s < slPlt->getStyleCount(); s++) styleTable[s] = s;
+  if (TPalette *slPlt = sl->getPalette()) {
+    styleAdded = mergePalette_Overlap(slPlt, imgPlt, keepOriginalPalette);
+    for (int s = 0; s < slPlt->getStyleCount(); s++) styleTable[s] = s;
+  }
 
   // Merge Image
   for (auto const &image : usedImageSet) {