Commit: cab2f0f6bdbcb6c13329774795554a195cd06ac3
Author: Jacques Lucke
Date: Fri Sep 20 15:04:00 2019 +0200
Branches: functions
https://developer.blender.org/rBcab2f0f6bdbcb6c13329774795554a195cd06ac3
declare more attributes in same place
===================================================================
M source/blender/simulations/bparticles/node_frontend.cpp
M source/blender/simulations/bparticles/simulate.cpp
===================================================================
diff --git a/source/blender/simulations/bparticles/node_frontend.cpp
b/source/blender/simulations/bparticles/node_frontend.cpp
index f5be1e5db52..d5285c4685e 100644
--- a/source/blender/simulations/bparticles/node_frontend.cpp
+++ b/source/blender/simulations/bparticles/node_frontend.cpp
@@ -779,6 +779,9 @@ static void collect_influences(VTreeData &vtree_data,
for (std::string &system_name : r_system_names) {
AttributesDeclaration attributes;
+ attributes.add<uint8_t>("Kill State", 0);
+ attributes.add<int32_t>("ID", 0);
+ attributes.add<float>("Birth Time", 0);
attributes.add<float3>("Position", float3(0, 0, 0));
attributes.add<float3>("Velocity", float3(0, 0, 0));
attributes.add<float>("Size", 0.05f);
diff --git a/source/blender/simulations/bparticles/simulate.cpp
b/source/blender/simulations/bparticles/simulate.cpp
index bb0ad748a34..5a570bde155 100644
--- a/source/blender/simulations/bparticles/simulate.cpp
+++ b/source/blender/simulations/bparticles/simulate.cpp
@@ -526,10 +526,6 @@ BLI_NOINLINE static AttributesInfo
build_attribute_info_for_system(ParticleSyste
event->attributes(builder);
}
- builder.add<uint8_t>("Kill State", 0);
- builder.add<int32_t>("ID", 0);
- builder.add<float>("Birth Time", 0);
-
return AttributesInfo(builder);
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
