Merge branch 'master' into debug-merge
This commit is contained in:
commit
5e7748ccf8
@ -61,9 +61,9 @@ fn add_brush<'a>(
|
|||||||
rendercolor.b as f32
|
rendercolor.b as f32
|
||||||
])/255.0).extend(1.0);
|
])/255.0).extend(1.0);
|
||||||
|
|
||||||
match model.split_at(1){
|
match model.chars().next(){
|
||||||
// The first character of brush.model is '*'
|
// The first character of brush.model is '*'
|
||||||
("*",id_str)=>match id_str.parse(){
|
Some('*')=>match model[1..].parse(){
|
||||||
Ok(mesh_id)=>{
|
Ok(mesh_id)=>{
|
||||||
let mesh=model::MeshId::new(mesh_id);
|
let mesh=model::MeshId::new(mesh_id);
|
||||||
let model_id=model::ModelId::new(world_models.len() as u32);
|
let model_id=model::ModelId::new(world_models.len() as u32);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user