git-svn-id: svn://db.shs.com.ru/libs@613 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -55,6 +55,8 @@ void MaterialMapEditor::setMap(const Map & m) {
|
||||
active = false;
|
||||
ui->sliderAmount->setValue(m.color_amount);
|
||||
ui->sliderOffset->setValue(m.color_offset);
|
||||
ui->spinScaleX->setValue(m.bitmap_scale.x());
|
||||
ui->spinScaleY->setValue(m.bitmap_scale.y());
|
||||
ui->linePath->setProperty("GLpath", m.bitmap_path); ui->linePath->setText(QFileInfo(m.bitmap_path).fileName());
|
||||
updateIcon();
|
||||
active = true;
|
||||
@@ -65,6 +67,8 @@ Map MaterialMapEditor::map() {
|
||||
Map m;
|
||||
m.color_amount = ui->sliderAmount->value();
|
||||
m.color_offset = ui->sliderOffset->value();
|
||||
m.bitmap_scale.setX(ui->spinScaleX->value());
|
||||
m.bitmap_scale.setY(ui->spinScaleY->value());
|
||||
m.bitmap_path = ui->linePath->property("GLpath").toString();
|
||||
return m;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user