Merge branch 'master' into nodeview-redux
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -263,7 +263,7 @@ private:
|
||||
QMatrix4x4 translate_matrix_;
|
||||
|
||||
/**
|
||||
* @breif Scale only matrix.
|
||||
* @brief Scale only matrix.
|
||||
*/
|
||||
QMatrix4x4 scale_matrix_;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user