[Bf-blender-cvs] [3f28239efef] functions: move events ui to same file

[Jacques Lucke]

Commit: 3f28239efef2d58018c23b7ec08d0cb8b4e7f5fd
Author: Jacques Lucke
Date:   Wed Sep 11 10:55:37 2019 +0200
Branches: functions
https://developer.blender.org/rB3f28239efef2d58018c23b7ec08d0cb8b4e7f5fd

move events ui to same file

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

R057	release/scripts/startup/nodes/bparticle_nodes/age_reached_event.py	release/scripts/startup/nodes/bparticle_nodes/events.py
D	release/scripts/startup/nodes/bparticle_nodes/mesh_collision_event.py

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

diff --git a/release/scripts/startup/nodes/bparticle_nodes/age_reached_event.py b/release/scripts/startup/nodes/bparticle_nodes/events.py
similarity index 57%
rename from release/scripts/startup/nodes/bparticle_nodes/age_reached_event.py
rename to release/scripts/startup/nodes/bparticle_nodes/events.py
index 5c3b50781a9..a7a9e3e544a 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/age_reached_event.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/events.py
@@ -3,6 +3,7 @@ from bpy.props import *
 from .. base import BParticlesNode
 from .. node_builder import NodeBuilder
 
+
 class AgeReachedEventNode(bpy.types.Node, BParticlesNode):
     bl_idname = "bp_AgeReachedEventNode"
     bl_label = "Age Reached Event"
@@ -15,3 +16,16 @@ class AgeReachedEventNode(bpy.types.Node, BParticlesNode):
         builder.execute_input("execute_on_event", "Execute on Event", "execute_on_event__prop")
 
         builder.particle_effector_output("event", "Event")
+
+
+class MeshCollisionEventNode(bpy.types.Node, BParticlesNode):
+    bl_idname = "bp_MeshCollisionEventNode"
+    bl_label = "Mesh Collision Event"
+
+    execute_on_event__prop: NodeBuilder.ExecuteInputProperty()
+
+    def declaration(self, builder: NodeBuilder):
+        builder.fixed_input("object", "Object", "Object")
+        builder.execute_input("execute_on_event", "Execute on Event", "execute_on_event__prop")
+
+        builder.particle_effector_output("event", "Event")
diff --git a/release/scripts/startup/nodes/bparticle_nodes/mesh_collision_event.py b/release/scripts/startup/nodes/bparticle_nodes/mesh_collision_event.py
deleted file mode 100644
index b87d2a50937..00000000000
--- a/release/scripts/startup/nodes/bparticle_nodes/mesh_collision_event.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import bpy
-from bpy.props import *
-from .. base import BParticlesNode
-from .. node_builder import NodeBuilder
-
-class MeshCollisionEventNode(bpy.types.Node, BParticlesNode):
-    bl_idname = "bp_MeshCollisionEventNode"
-    bl_label = "Mesh Collision Event"
-
-    execute_on_event__prop: NodeBuilder.ExecuteInputProperty()
-
-    def declaration(self, builder: NodeBuilder):
-        builder.fixed_input("object", "Object", "Object")
-        builder.execute_input("execute_on_event", "Execute on Event", "execute_on_event__prop")
-
-        builder.particle_effector_output("event", "Event")