Changeset 515 for trunk/nv/engine/model_manager.hh
- Timestamp:
- 08/16/16 19:45:45 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/nv/engine/model_manager.hh
r512 r515 40 40 resource< data_channel_set > mesh; 41 41 resource< material > material; 42 string32 tag; 42 43 transform local; 43 44 random_range< vec3 > position; … … 54 55 target->mesh = mesh; 55 56 target->material = material; 57 target->tag = tag; 56 58 target->local = local; 57 59 target->rotation = rotation; … … 84 86 resource< data_channel_set > mesh; 85 87 resource< material > material; 88 shash64 tag; 86 89 sint16 attach_id; 87 90 sint16 parent_id; … … 176 179 if ( m == selected ) parent_flags |= FMF_FOCUS; 177 180 178 if ( m->mesh || m->force )181 if ( m->mesh || m->force || !m->tag.empty() ) 179 182 { 180 183 uint32 id = result.count++; … … 183 186 re.material = m->material; 184 187 re.local = tr; 188 re.tag = m->tag; 185 189 re.parent_id = parent_id; 186 190 re.attach_id = m->attach_id;
Note: See TracChangeset
for help on using the changeset viewer.