projects
/
ld37_one_room
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
backported changes from museum project
[ld37_one_room]
/
src
/
metascene.cc
diff --git
a/src/metascene.cc
b/src/metascene.cc
index
e0b2b20
..
53474f7
100644
(file)
--- a/
src/metascene.cc
+++ b/
src/metascene.cc
@@
-1,3
+1,4
@@
+#include <assert.h>
#include <string>
#include <regex>
#include "metascene.h"
#include <string>
#include <regex>
#include "metascene.h"
@@
-303,7
+304,7
@@
static void apply_mtledit(Scene *scn, const MaterialEdit &med)
int nobj = scn->objects.size();
for(int i=0; i<nobj; i++) {
Object *obj = scn->objects[i];
int nobj = scn->objects.size();
for(int i=0; i<nobj; i++) {
Object *obj = scn->objects[i];
- if(std::regex_match(obj->get_name(), med.name_re)) {
+ if(std::regex_match(obj->mtl.name, med.name_re)) {
apply_mtledit(&obj->mtl, med);
}
}
apply_mtledit(&obj->mtl, med);
}
}