[Bf-blender-cvs] [773b6bbd421] functions: rename modifier to effector in some places

[Jacques Lucke]

Commit: 773b6bbd421a4195591223f208c2ca2c97ce045e
Author: Jacques Lucke
Date:   Tue Jul 30 13:58:17 2019 +0200
Branches: functions
https://developer.blender.org/rB773b6bbd421a4195591223f208c2ca2c97ce045e

rename modifier to effector in some places

That was missing in a previous commit.

===================================================================

M	release/scripts/startup/nodes/bparticle_nodes/gravity_force.py
M	release/scripts/startup/nodes/bparticle_nodes/particle_type.py
M	release/scripts/startup/nodes/bparticle_nodes/trails.py
M	release/scripts/startup/nodes/bparticle_nodes/turbulence_force.py
M	release/scripts/startup/nodes/declaration/__init__.py
M	release/scripts/startup/nodes/declaration/bparticles.py
M	release/scripts/startup/nodes/node_builder.py
M	release/scripts/startup/nodes/sockets.py

===================================================================

diff --git a/release/scripts/startup/nodes/bparticle_nodes/gravity_force.py b/release/scripts/startup/nodes/bparticle_nodes/gravity_force.py
index b23c3c1bd91..8a0691f0061 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/gravity_force.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/gravity_force.py
@@ -9,4 +9,4 @@ class GravityForceNode(bpy.types.Node, BParticlesNode):
 
     def declaration(self, builder: NodeBuilder):
         builder.fixed_input("direction", "Direction", "Vector", default=(0, 0, -1))
-        builder.particle_modifier_output("force", "Force")
+        builder.particle_effector_output("force", "Force")
diff --git a/release/scripts/startup/nodes/bparticle_nodes/particle_type.py b/release/scripts/startup/nodes/bparticle_nodes/particle_type.py
index 127342f5a7f..7cb1c697295 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/particle_type.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/particle_type.py
@@ -8,7 +8,7 @@ class ParticleTypeNode(bpy.types.Node, BParticlesNode):
 
     def declaration(self, builder: NodeBuilder):
         builder.emitter_input("emitters", "Emitters")
-        builder.particle_modifier_input("effectors", "Effectors")
+        builder.particle_effector_input("effectors", "Effectors")
         builder.event_output("events", "Events")
 
     def draw(self, layout):
diff --git a/release/scripts/startup/nodes/bparticle_nodes/trails.py b/release/scripts/startup/nodes/bparticle_nodes/trails.py
index fa61dd1764d..510bc20e250 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/trails.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/trails.py
@@ -11,7 +11,7 @@ class ParticleTrailsNode(bpy.types.Node, BParticlesNode):
 
     def declaration(self, builder: NodeBuilder):
         builder.fixed_input("rate", "Rate", "Float", default=10)
-        builder.particle_modifier_output("effect", "Effect")
+        builder.particle_effector_output("effect", "Effect")
 
     def draw(self, layout):
         layout.prop(self, "particle_type_name", text="", icon="MOD_PARTICLES")
diff --git a/release/scripts/startup/nodes/bparticle_nodes/turbulence_force.py b/release/scripts/startup/nodes/bparticle_nodes/turbulence_force.py
index aa365b7e268..14530165c07 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/turbulence_force.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/turbulence_force.py
@@ -9,4 +9,4 @@ class TurbulenceForceNode(bpy.types.Node, BParticlesNode):
 
     def declaration(self, builder: NodeBuilder):
         builder.fixed_input("strength", "Strength", "Vector", default=(1, 1, 1))
-        builder.particle_modifier_output("force", "Force")
+        builder.particle_effector_output("force", "Force")
diff --git a/release/scripts/startup/nodes/declaration/__init__.py b/release/scripts/startup/nodes/declaration/__init__.py
index b05590784f2..b37d1770832 100644
--- a/release/scripts/startup/nodes/declaration/__init__.py
+++ b/release/scripts/startup/nodes/declaration/__init__.py
@@ -9,5 +9,5 @@ from . bparticles import (
     EmitterSocketDecl,
     EventSocketDecl,
     ControlFlowSocketDecl,
-    ParticleModifierSocketDecl,
+    ParticleEffectorSocketDecl,
 )
diff --git a/release/scripts/startup/nodes/declaration/bparticles.py b/release/scripts/startup/nodes/declaration/bparticles.py
index 85b1b70fe3e..9731a3f8e30 100644
--- a/release/scripts/startup/nodes/declaration/bparticles.py
+++ b/release/scripts/startup/nodes/declaration/bparticles.py
@@ -86,14 +86,14 @@ class ControlFlowSocketDecl(SocketDeclBase):
     def amount(self):
         return 1
 
-class ParticleModifierSocketDecl(SocketDeclBase):
+class ParticleEffectorSocketDecl(SocketDeclBase):
     def __init__(self, node, identifier: str, display_name: str):
         self.node = node
         self.identifier = identifier
         self.display_name = display_name
 
     def build(self, node_sockets):
-        socket = node_sockets.new("bp_ParticleModifierSocket", self.display_name, identifier=self.identifier)
+        socket = node_sockets.new("bp_ParticleEffectorSocket", self.display_name, identifier=self.identifier)
         socket.link_limit = MAX_LINK_LIMIT
         return [socket]
 
@@ -101,7 +101,7 @@ class ParticleModifierSocketDecl(SocketDeclBase):
         if len(sockets) != 1:
             return False
         socket = sockets[0]
-        if socket.bl_idname != "bp_ParticleModifierSocket":
+        if socket.bl_idname != "bp_ParticleEffectorSocket":
             return False
         if socket.name != self.display_name:
             return False
diff --git a/release/scripts/startup/nodes/node_builder.py b/release/scripts/startup/nodes/node_builder.py
index d860a9e97c2..98153e92f49 100644
--- a/release/scripts/startup/nodes/node_builder.py
+++ b/release/scripts/startup/nodes/node_builder.py
@@ -9,7 +9,7 @@ from . declaration import (
     EmitterSocketDecl,
     EventSocketDecl,
     ControlFlowSocketDecl,
-    ParticleModifierSocketDecl,
+    ParticleEffectorSocketDecl,
 
     NoDefaultValue,
 )
@@ -204,12 +204,12 @@ class NodeBuilder:
         decl = ControlFlowSocketDecl(self.node, identifier, name)
         self._add_output(decl)
 
-    def particle_modifier_input(self, identifier, name):
-        decl = ParticleModifierSocketDecl(self.node, identifier, name)
+    def particle_effector_input(self, identifier, name):
+        decl = ParticleEffectorSocketDecl(self.node, identifier, name)
         self._add_input(decl)
 
-    def particle_modifier_output(self, identifier, name):
-        decl = ParticleModifierSocketDecl(self.node, identifier, name)
+    def particle_effector_output(self, identifier, name):
+        decl = ParticleEffectorSocketDecl(self.node, identifier, name)
         self._add_output(decl)
 
 
diff --git a/release/scripts/startup/nodes/sockets.py b/release/scripts/startup/nodes/sockets.py
index dee55128b56..6796b4273e9 100644
--- a/release/scripts/startup/nodes/sockets.py
+++ b/release/scripts/startup/nodes/sockets.py
@@ -171,7 +171,7 @@ class ControlFlowSocket(bpy.types.NodeSocket, BaseSocket):
     bl_label = "Control Flow Socket"
     color = (0.8, 0.2, 0.2, 1)
 
-class ParticleModifierSocket(bpy.types.NodeSocket, BaseSocket):
-    bl_idname = "bp_ParticleModifierSocket"
+class ParticleEffectorSocket(bpy.types.NodeSocket, BaseSocket):
+    bl_idname = "bp_ParticleEffectorSocket"
     bl_label = "Particle Modifier Socket"
     color = (0.8, 0.8, 0.2, 1)