[Bf-blender-cvs] [c5caaafd7f7] functions: move collision info and particle info node in same file

Jacques Lucke noreply at git.blender.org
Fri Aug 2 19:14:40 CEST 2019


Commit: c5caaafd7f797a2d7379a7d41d2ad5359e165052
Author: Jacques Lucke
Date:   Fri Aug 2 09:37:37 2019 +0200
Branches: functions
https://developer.blender.org/rBc5caaafd7f797a2d7379a7d41d2ad5359e165052

move collision info and particle info node in same file

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

D	release/scripts/startup/nodes/bparticle_nodes/collision_info.py
R070	release/scripts/startup/nodes/bparticle_nodes/particle_info.py	release/scripts/startup/nodes/bparticle_nodes/particle_inputs.py

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

diff --git a/release/scripts/startup/nodes/bparticle_nodes/collision_info.py b/release/scripts/startup/nodes/bparticle_nodes/collision_info.py
deleted file mode 100644
index d48ead22af1..00000000000
--- a/release/scripts/startup/nodes/bparticle_nodes/collision_info.py
+++ /dev/null
@@ -1,11 +0,0 @@
-import bpy
-from bpy.props import *
-from .. base import BParticlesNode
-from .. node_builder import NodeBuilder
-
-class CollisionInfoNode(bpy.types.Node, BParticlesNode):
-    bl_idname = "bp_CollisionInfoNode"
-    bl_label = "Collision Info"
-
-    def declaration(self, builder: NodeBuilder):
-        builder.fixed_output("normal", "Normal", "Vector")
diff --git a/release/scripts/startup/nodes/bparticle_nodes/particle_info.py b/release/scripts/startup/nodes/bparticle_nodes/particle_inputs.py
similarity index 70%
rename from release/scripts/startup/nodes/bparticle_nodes/particle_info.py
rename to release/scripts/startup/nodes/bparticle_nodes/particle_inputs.py
index aea0e5472e3..c77e2da251d 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/particle_info.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/particle_inputs.py
@@ -3,6 +3,7 @@ from bpy.props import *
 from .. base import BParticlesNode
 from .. node_builder import NodeBuilder
 
+
 class ParticleInfoNode(bpy.types.Node, BParticlesNode):
     bl_idname = "bp_ParticleInfoNode"
     bl_label = "Particle Info"
@@ -13,3 +14,11 @@ class ParticleInfoNode(bpy.types.Node, BParticlesNode):
         builder.fixed_output("velocity", "Velocity", "Vector")
         builder.fixed_output("birth_time", "Birth Time", "Float")
         builder.fixed_output("age", "Age", "Float")
+
+
+class CollisionInfoNode(bpy.types.Node, BParticlesNode):
+    bl_idname = "bp_CollisionInfoNode"
+    bl_label = "Collision Info"
+
+    def declaration(self, builder: NodeBuilder):
+        builder.fixed_output("normal", "Normal", "Vector")



More information about the Bf-blender-cvs mailing list