Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 03:35:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix EntityPropertyList merge

Browse source
This commit is contained in:
David Rowe 2015-09-04 15:31:21 -07:00
parent e86581ab64
commit c9cf426dba
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/entities/src/EntityPropertyFlags.h
View file

@ -138,9 +138,6 @@ enum EntityPropertyList {
// used by particles // used by particles
PROP_VELOCITY_SPREAD, PROP_VELOCITY_SPREAD,
PROP_ACCELERATION_SPREAD, PROP_ACCELERATION_SPREAD,
PROP_RADIUS_SPREAD,
PROP_RADIUS_START,
PROP_RADIUS_FINISH,
PROP_X_N_NEIGHBOR_ID, // used by PolyVox PROP_X_N_NEIGHBOR_ID, // used by PolyVox
PROP_Y_N_NEIGHBOR_ID, // used by PolyVox PROP_Y_N_NEIGHBOR_ID, // used by PolyVox
@ -149,6 +146,11 @@ enum EntityPropertyList {
PROP_Y_P_NEIGHBOR_ID, // used by PolyVox PROP_Y_P_NEIGHBOR_ID, // used by PolyVox
PROP_Z_P_NEIGHBOR_ID, // used by PolyVox PROP_Z_P_NEIGHBOR_ID, // used by PolyVox
// Used by particles
PROP_RADIUS_SPREAD,
PROP_RADIUS_START,
PROP_RADIUS_FINISH,
//////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////
// ATTENTION: add new properties to end of list just ABOVE this line // ATTENTION: add new properties to end of list just ABOVE this line
PROP_AFTER_LAST_ITEM, PROP_AFTER_LAST_ITEM,