[Bf-blender-cvs] [e26301b30a9] functions: Rename Particle Type to Particle System and Behaviors to Influences
Jacques Lucke
noreply at git.blender.org
Fri Sep 13 14:09:43 CEST 2019
Commit: e26301b30a9614c6e8739352cf961f4294f3bb29
Author: Jacques Lucke
Date: Fri Sep 13 14:09:32 2019 +0200
Branches: functions
https://developer.blender.org/rBe26301b30a9614c6e8739352cf961f4294f3bb29
Rename Particle Type to Particle System and Behaviors to Influences
===================================================================
M release/scripts/startup/bl_operators/modifiers.py
M release/scripts/startup/nodes/base.py
M release/scripts/startup/nodes/bparticle_nodes/always_execute.py
D release/scripts/startup/nodes/bparticle_nodes/combine_behaviors.py
A release/scripts/startup/nodes/bparticle_nodes/combine_influences.py
M release/scripts/startup/nodes/bparticle_nodes/explode_particle.py
M release/scripts/startup/nodes/bparticle_nodes/particle_type.py
M release/scripts/startup/nodes/bparticle_nodes/size_over_time.py
M release/scripts/startup/nodes/bparticle_nodes/trails.py
M source/blender/makesdna/DNA_modifier_types.h
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/modifiers/intern/MOD_bparticles_output.c
M source/blender/simulations/bparticles/actions.cpp
M source/blender/simulations/bparticles/actions.hpp
M source/blender/simulations/bparticles/c_wrapper.cpp
M source/blender/simulations/bparticles/emitters.cpp
M source/blender/simulations/bparticles/emitters.hpp
M source/blender/simulations/bparticles/node_frontend.cpp
M source/blender/simulations/bparticles/offset_handlers.cpp
M source/blender/simulations/bparticles/offset_handlers.hpp
M source/blender/simulations/bparticles/particle_allocator.cpp
M source/blender/simulations/bparticles/particle_allocator.hpp
M source/blender/simulations/bparticles/particles_state.hpp
M source/blender/simulations/bparticles/simulate.cpp
M source/blender/simulations/bparticles/simulate.hpp
===================================================================
diff --git a/release/scripts/startup/bl_operators/modifiers.py b/release/scripts/startup/bl_operators/modifiers.py
index 60cbb9b36a7..75e168c94d1 100644
--- a/release/scripts/startup/bl_operators/modifiers.py
+++ b/release/scripts/startup/bl_operators/modifiers.py
@@ -69,7 +69,7 @@ class NewBParticlesTree(bpy.types.Operator, ModifierOperator):
tree = bpy.data.node_groups.new("Particle System", "BParticlesTree")
- type_node = tree.nodes.new("bp_ParticleTypeNode")
+ type_node = tree.nodes.new("bp_ParticleSystemNode")
emitter_node = tree.nodes.new("bp_PointEmitterNode")
emitter_node.location = (-250, 200)
diff --git a/release/scripts/startup/nodes/base.py b/release/scripts/startup/nodes/base.py
index c2d20b2570c..630841e5078 100644
--- a/release/scripts/startup/nodes/base.py
+++ b/release/scripts/startup/nodes/base.py
@@ -223,7 +223,7 @@ class BParticlesNode(BaseNode):
for node in self.tree.nodes:
node.select = False
- new_node = self.tree.nodes.new("bp_ParticleTypeNode")
+ new_node = self.tree.nodes.new("bp_ParticleSystemNode")
new_node.select = True
self.tree.nodes.active = new_node
new_node.location = self.location
diff --git a/release/scripts/startup/nodes/bparticle_nodes/always_execute.py b/release/scripts/startup/nodes/bparticle_nodes/always_execute.py
index 308d8b6a771..5889d22ee57 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/always_execute.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/always_execute.py
@@ -12,4 +12,4 @@ class AlwaysExecuteNode(bpy.types.Node, BParticlesNode):
def declaration(self, builder: NodeBuilder):
builder.execute_input("execute", "Execute", "execute__prop")
- builder.particle_effector_output("type", "Type")
+ builder.particle_effector_output("influence", "Influence")
diff --git a/release/scripts/startup/nodes/bparticle_nodes/combine_behaviors.py b/release/scripts/startup/nodes/bparticle_nodes/combine_behaviors.py
deleted file mode 100644
index f8c68bcce4c..00000000000
--- a/release/scripts/startup/nodes/bparticle_nodes/combine_behaviors.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import bpy
-from .. base import BParticlesNode
-from .. node_builder import NodeBuilder
-
-class CombineBehaviorsNode(bpy.types.Node, BParticlesNode):
- bl_idname = "bp_CombineBehaviorsNode"
- bl_label = "Combine Behaviors"
-
- def declaration(self, builder: NodeBuilder):
- builder.particle_effector_input("behaviors", "Behaviors")
- builder.particle_effector_output("behaviors", "Behaviors")
diff --git a/release/scripts/startup/nodes/bparticle_nodes/combine_influences.py b/release/scripts/startup/nodes/bparticle_nodes/combine_influences.py
new file mode 100644
index 00000000000..983c0d34115
--- /dev/null
+++ b/release/scripts/startup/nodes/bparticle_nodes/combine_influences.py
@@ -0,0 +1,11 @@
+import bpy
+from .. base import BParticlesNode
+from .. node_builder import NodeBuilder
+
+class CombineInfluencesNode(bpy.types.Node, BParticlesNode):
+ bl_idname = "bp_CombineInfluencesNode"
+ bl_label = "Combine Influences"
+
+ def declaration(self, builder: NodeBuilder):
+ builder.particle_effector_input("influences", "Influences")
+ builder.particle_effector_output("influences", "Influences")
diff --git a/release/scripts/startup/nodes/bparticle_nodes/explode_particle.py b/release/scripts/startup/nodes/bparticle_nodes/explode_particle.py
index 4de130a649a..d6876106f38 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/explode_particle.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/explode_particle.py
@@ -15,4 +15,4 @@ class ExplodeParticleNode(bpy.types.Node, BParticlesNode):
builder.execute_input("execute_on_birth", "Execute on Birth", "execute_on_birth__prop")
builder.execute_output("execute", "Execute")
- builder.particle_effector_output("type", "Type")
+ builder.particle_effector_output("explode_system", "Explode System")
diff --git a/release/scripts/startup/nodes/bparticle_nodes/particle_type.py b/release/scripts/startup/nodes/bparticle_nodes/particle_type.py
index 838574c0505..4e436d92376 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/particle_type.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/particle_type.py
@@ -2,14 +2,14 @@ import bpy
from .. base import BParticlesNode
from .. node_builder import NodeBuilder
-class ParticleTypeNode(bpy.types.Node, BParticlesNode):
- bl_idname = "bp_ParticleTypeNode"
- bl_label = "Particle Type"
+class ParticleSystemNode(bpy.types.Node, BParticlesNode):
+ bl_idname = "bp_ParticleSystemNode"
+ bl_label = "Particle System"
def declaration(self, builder: NodeBuilder):
builder.background_color((0.8, 0.5, 0.4))
- builder.particle_effector_input("type", "Type")
+ builder.particle_effector_input("influences", "Influences")
def draw(self, layout):
layout.prop(self, "name", text="", icon="MOD_PARTICLES")
diff --git a/release/scripts/startup/nodes/bparticle_nodes/size_over_time.py b/release/scripts/startup/nodes/bparticle_nodes/size_over_time.py
index 9be5b8d4241..f7165870dda 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/size_over_time.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/size_over_time.py
@@ -10,4 +10,4 @@ class SizeOverTimeNode(bpy.types.Node, BParticlesNode):
def declaration(self, builder: NodeBuilder):
builder.fixed_input("final_size", "Final Size", "Float", default=0.0)
builder.fixed_input("final_age", "Final Age", "Float", default=3)
- builder.particle_effector_output("type", "Type")
+ builder.particle_effector_output("influence", "Influence")
diff --git a/release/scripts/startup/nodes/bparticle_nodes/trails.py b/release/scripts/startup/nodes/bparticle_nodes/trails.py
index be8a6da0e95..6e634cba873 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/trails.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/trails.py
@@ -12,5 +12,5 @@ class ParticleTrailsNode(bpy.types.Node, BParticlesNode):
def declaration(self, builder: NodeBuilder):
builder.fixed_input("rate", "Rate", "Float", default=20)
builder.execute_input("execute_on_birth", "Execute on Birth", "execute_on_birth__prop")
- builder.particle_effector_output("main_type", "Main Type")
- builder.particle_effector_output("trail_type", "Trail Type")
+ builder.particle_effector_output("main_system", "Main System")
+ builder.particle_effector_output("trail_system", "Trail System")
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 18877f627c9..10a57ccd20f 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -2003,7 +2003,7 @@ typedef struct BParticlesModifierData {
typedef struct BParticlesOutputModifierData {
ModifierData modifier;
struct Object *source_object;
- char source_particle_type[64];
+ char source_particle_system[64];
/* eBParticlesOutputType */
unsigned int output_type;
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index fcb57869322..840c50cde9d 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -6095,12 +6095,12 @@ static void rna_def_modifier_bparticles_output(BlenderRNA *brna)
prop = RNA_def_property(srna, "source_object", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_EDITABLE);
- RNA_def_property_ui_text(prop, "Source Object", "Object to copy a particle type from");
+ RNA_def_property_ui_text(prop, "Source Object", "Object to copy a particle system from");
RNA_def_property_update(prop, 0, "rna_Modifier_dependency_update");
- prop = RNA_def_property(srna, "source_particle_type", PROP_STRING, PROP_NONE);
+ prop = RNA_def_property(srna, "source_particle_system", PROP_STRING, PROP_NONE);
RNA_def_property_ui_text(
- prop, "Particle Type", "Name of the particle type that should be copied");
+ prop, "Particle System", "Name of the particle system that should be copied");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "output_type", PROP_ENUM, PROP_NONE);
diff --git a/source/blender/modifiers/intern/MOD_bparticles_output.c b/source/blender/modifiers/intern/MOD_bparticles_output.c
index 223a5af9301..537a58e3139 100644
--- a/source/blender/modifiers/intern/MOD_bparticles_output.c
+++ b/source/blender/modifiers/intern/MOD_bparticles_output.c
@@ -66,10 +66,10 @@ static Mesh *applyModifier(ModifierData *md,
if (bpmd->output_type == MOD_BPARTICLES_OUTPUT_TETRAHEDONS) {
return BParticles_state_extract_type__tetrahedons(simulation_state,
- bpmd->source_particle_type);
+ bpmd->source_particle_system);
}
else if (bpmd->output_type == MOD_BPARTICLES_OUTPUT_POINTS) {
- return BParticles_state_extract_type__points(simulation_state, bpmd->source_particle_type);
+ return BParticles_state_extract_type__points(simulation_state, bpmd->source_particle_system);
}
else {
return BKE_mesh_new_nomain(0, 0, 0, 0, 0);
diff --git a/source/blender/simulations/bparticles/actions.cpp b/source/blender/simulations/bparticles/actions.cpp
index 72d751de7e5..72b04c978a5 100644
--- a/source/blender/simulations/bparticles/actions.cpp
+++ b/source/blender/simulations/bparticles/actions.cpp
@@ -145,8 +145,9 @@ void ExplodeAction::execute(ActionInterface &interface)
}
}
- for (StringRef type_name : m_types_to_emit) {
- auto new_particles = interface.particle_allocator().request(type_name, new_birth_times.size());
+ for (StringRef system_name : m_systems_to_emit) {
+ auto new_particles = interface.particle_allocator().request(system_name,
+ new_birth_times.size());
new_particles.set<float3>("Position", new_positions);
new_particles.set<float3>("Velocity", new_velociti
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list