Merge branch 'master' into nodeview-redux

This commit is contained in:
itsmattkc
2021-07-16 20:09:33 -07:00
13 changed files with 100 additions and 69 deletions
+1 -1
View File
@@ -48,7 +48,7 @@ SliderLabel::SliderLabel(QWidget *parent) :
// Allow users to tab to this widget
setFocusPolicy(Qt::TabFocus);
// Add ccustom context menu
// Add custom context menu
setContextMenuPolicy(Qt::CustomContextMenu);
}
+1 -1
View File
@@ -263,7 +263,7 @@ private:
QMatrix4x4 translate_matrix_;
/**
* @breif Scale only matrix.
* @brief Scale only matrix.
*/
QMatrix4x4 scale_matrix_;