Merge branch 'master' into pr/1875

app/node/generator/shape/shapenodebase.cpp

@@ -69,6 +69,7 @@ void ShapeNodeBase::Retranslate()
 {
   super::Retranslate();
 
+  SetInputName(kBaseInput, tr("Base"));
   SetInputName(kPositionInput, tr("Position"));
   SetInputName(kSizeInput, tr("Size"));
 

app/node/generator/text/textv3.cpp

@@ -76,7 +76,6 @@ void TextGeneratorV3::Retranslate()
   super::Retranslate();
 
   SetInputName(kTextInput, tr("Text"));
-  SetInputName(kBaseInput, tr("Base"));
 }
 
 void TextGeneratorV3::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const

app/widget/colorwheel/colorvalueswidget.cpp

@@ -179,7 +179,7 @@ void ColorValuesWidget::ColorPickedBtnToggled(bool e)
 
     // Restore original color (or use overridden color from eventFilter)
     SetReferenceColor(picker_end_color_);
-    emit ColorChanged(picker_end_color_);
+    emit ColorChanged(input_tab_->GetColor());
   }
 }