[Bf-blender-cvs] [5eecfaf8240] functions: better distinction between particle simulation and system

Jacques Lucke noreply at git.blender.org
Sun Sep 22 13:55:02 CEST 2019


Commit: 5eecfaf82405f0ddebca2d1c7a8d7bbe6f73c0e4
Author: Jacques Lucke
Date:   Sun Sep 22 12:59:13 2019 +0200
Branches: functions
https://developer.blender.org/rB5eecfaf82405f0ddebca2d1c7a8d7bbe6f73c0e4

better distinction between particle simulation and system

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

M	release/scripts/startup/bl_operators/modifiers.py
M	release/scripts/startup/bl_ui/properties_data_modifier.py
M	release/scripts/startup/bl_ui/space_view3d.py
M	release/scripts/startup/nodes/bparticle_nodes/particle_system.py

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

diff --git a/release/scripts/startup/bl_operators/modifiers.py b/release/scripts/startup/bl_operators/modifiers.py
index 57ddf32996b..9f0b2df3ee7 100644
--- a/release/scripts/startup/bl_operators/modifiers.py
+++ b/release/scripts/startup/bl_operators/modifiers.py
@@ -67,7 +67,7 @@ class NewBParticlesTree(bpy.types.Operator, ModifierOperator):
         if mod is None:
             return {'CANCELLED'}
 
-        tree = bpy.data.node_groups.new("Particle System", "BParticlesTree")
+        tree = bpy.data.node_groups.new("Particle Simulation", "BParticlesTree")
 
         type_node = tree.nodes.new("bp_ParticleSystemNode")
 
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index cf84b8009a3..95c5b0ae5f7 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -1674,7 +1674,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
 
     def BPARTICLES_OUTPUT(self, layout, ob, md):
         layout.prop(md, "source_object")
-        layout.prop(md, "source_particle_system")
+        layout.prop(md, "source_particle_system", icon="PHYSICS")
         layout.prop(md, "output_type")
 
 
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index bbf89d96efd..db405e6fa28 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2053,7 +2053,7 @@ class VIEW3D_MT_add(Menu):
 
         layout.separator()
 
-        layout.operator("bp.new_particle_system", text="Particle System", icon='MOD_PARTICLES')
+        layout.operator("bp.new_particle_system", text="Particle Simulation", icon='MOD_PARTICLES')
 
         layout.separator()
 
diff --git a/release/scripts/startup/nodes/bparticle_nodes/particle_system.py b/release/scripts/startup/nodes/bparticle_nodes/particle_system.py
index abd246864a7..ce66bb51abc 100644
--- a/release/scripts/startup/nodes/bparticle_nodes/particle_system.py
+++ b/release/scripts/startup/nodes/bparticle_nodes/particle_system.py
@@ -12,4 +12,4 @@ class ParticleSystemNode(bpy.types.Node, BParticlesNode):
         builder.influences_input("influences", "Influences")
 
     def draw(self, layout):
-        layout.prop(self, "name", text="", icon="MOD_PARTICLES")
+        layout.prop(self, "name", text="", icon="PHYSICS")



More information about the Bf-blender-cvs mailing list