Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2020-10-20 13:07:42 +0300
committerJacques Lucke <jacques@blender.org>2020-10-20 13:07:42 +0300
commit6ced026ae1547ac28c88516a0d061315aeacc913 (patch)
tree60c61867746df72e8cf87efd47d5d27fbbb27109 /release
parent63a9f24b55d0b5d84d625bdbb44d498fb1f2ae01 (diff)
Simulation: remove particle nodes with outdated design
The design for how we approach the "Everything Nodes" project has changed. We will focus on a different part of the project initially. While future me will likely refer back to some of the code I remove here, there is no point in keeping this code around in master currently. It would just confuse other developers working on the project. This does not remove the simulation modifier and data block. Those are just cleaned up, so that the boilerplate code can be reused in the future.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_operators/object_quick_effects.py54
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py2
-rw-r--r--release/scripts/startup/nodeitems_builtins.py58
3 files changed, 0 insertions, 114 deletions
diff --git a/release/scripts/startup/bl_operators/object_quick_effects.py b/release/scripts/startup/bl_operators/object_quick_effects.py
index 8ac1262645b..0f4eb8a8507 100644
--- a/release/scripts/startup/bl_operators/object_quick_effects.py
+++ b/release/scripts/startup/bl_operators/object_quick_effects.py
@@ -573,63 +573,9 @@ class QuickLiquid(Operator):
return {'FINISHED'}
-
-class QuickParticles(Operator):
- """Use active object as particle emitter"""
- bl_idname = "object.quick_particles"
- bl_label = "Quick Particles"
-
- @classmethod
- def poll(cls, context):
- if not context.preferences.experimental.use_new_particle_system:
- return False
- if context.mode != 'OBJECT':
- return False
- if context.active_object is None:
- return False
- if context.active_object.type != 'MESH':
- return False
- return True
-
- def execute(self, context):
- pointcloud = bpy.data.pointclouds.new("Particles")
- pointcloud_object = bpy.data.objects.new("Particles", pointcloud)
- modifier = pointcloud_object.modifiers.new("Simulation", 'SIMULATION')
- simulation = bpy.data.simulations.new("Particle Simulation")
- tree = simulation.node_tree
-
- default_name = "Particles"
- particle_simulation_node = tree.nodes.new('SimulationNodeParticleSimulation')
- particle_simulation_node.name = default_name
- emitter_node = tree.nodes.new('SimulationNodeParticleMeshEmitter')
- emitter_node.location.x -= 200
- emitter_node.location.y += 50
- emitter_node.inputs["Object"].default_value = context.active_object
- force_node = tree.nodes.new('SimulationNodeForce')
- force_node.location.x -= 200
- force_node.location.y -= 100
- force_node.inputs["Force"].default_value = (0, 0, -1)
-
- tree.links.new(particle_simulation_node.inputs["Emitters"], emitter_node.outputs["Emitter"])
- tree.links.new(particle_simulation_node.inputs["Forces"], force_node.outputs["Force"])
-
- modifier.simulation = simulation
- modifier.data_path = default_name
-
- for obj in context.selected_objects:
- obj.select_set(False)
-
- context.collection.objects.link(pointcloud_object)
- pointcloud_object.select_set(True)
- context.view_layer.objects.active = pointcloud_object
- pointcloud_object.show_bounds = True
- return {'FINISHED'}
-
-
classes = (
QuickExplode,
QuickFur,
QuickSmoke,
QuickLiquid,
- QuickParticles,
)
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 38f2c67f501..b5ce8be3b6a 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -2691,8 +2691,6 @@ class VIEW3D_MT_object_quick_effects(Menu):
layout.operator("object.quick_explode")
layout.operator("object.quick_smoke")
layout.operator("object.quick_liquid")
- if context.preferences.experimental.use_new_particle_system:
- layout.operator("object.quick_particles")
class VIEW3D_MT_object_showhide(Menu):
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index 027f4068dc4..8d2b6198fd5 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -485,64 +485,6 @@ def not_implemented_node(idname):
simulation_node_categories = [
# Simulation Nodes
- SimulationNodeCategory("SIM_OUTPUT", "Output", items=[
- NodeItem("SimulationNodeParticleSimulation"),
- ]),
- SimulationNodeCategory("SIM_INPUTS", "Input", items=[
- NodeItem("SimulationNodeTime"),
- NodeItem("SimulationNodeParticleAttribute"),
- NodeItem("FunctionNodeGroupInstanceID"),
- NodeItem("ShaderNodeValue"),
- NodeItem("FunctionNodeObjectTransforms"),
- ]),
- SimulationNodeCategory("SIM_EMITTERS", "Emitters", items=[
- NodeItem("SimulationNodeParticleMeshEmitter"),
- not_implemented_node("SimulationNodeEmitParticles"),
- ]),
- SimulationNodeCategory("SIM_EVENTS", "Events", items=[
- NodeItem("SimulationNodeParticleBirthEvent"),
- NodeItem("SimulationNodeParticleTimeStepEvent"),
- NodeItem("SimulationNodeAgeReachedEvent"),
- not_implemented_node("SimulationNodeParticleMeshCollisionEvent"),
- ]),
- SimulationNodeCategory("SIM_FORCES", "Forces", items=[
- NodeItem("SimulationNodeForce"),
- ]),
- SimulationNodeCategory("SIM_EXECUTE", "Execute", items=[
- NodeItem("SimulationNodeSetParticleAttribute"),
- NodeItem("SimulationNodeExecuteCondition"),
- NodeItem("SimulationNodeKillParticle"),
- not_implemented_node("SimulationNodeMultiExecute"),
- ]),
- SimulationNodeCategory("SIM_NOISE", "Noise", items=[
- not_implemented_node("ShaderNodeTexNoise"),
- not_implemented_node("ShaderNodeTexWhiteNoise"),
- ]),
- SimulationNodeCategory("SIM_COLOR", "Color", items=[
- not_implemented_node("ShaderNodeMixRGB"),
- not_implemented_node("ShaderNodeInvert"),
- not_implemented_node("ShaderNodeHueSaturation"),
- not_implemented_node("ShaderNodeGamma"),
- not_implemented_node("ShaderNodeBrightContrast"),
- ]),
- SimulationNodeCategory("SIM_CONVERTER", "Converter", items=[
- NodeItem("ShaderNodeMapRange"),
- NodeItem("ShaderNodeClamp"),
- NodeItem("ShaderNodeMath"),
- NodeItem("ShaderNodeValToRGB"),
- NodeItem("ShaderNodeVectorMath"),
- NodeItem("ShaderNodeSeparateRGB"),
- NodeItem("ShaderNodeCombineRGB"),
- NodeItem("ShaderNodeSeparateXYZ"),
- NodeItem("ShaderNodeCombineXYZ"),
- not_implemented_node("ShaderNodeSeparateHSV"),
- not_implemented_node("ShaderNodeCombineHSV"),
- NodeItem("FunctionNodeBooleanMath"),
- NodeItem("FunctionNodeFloatCompare"),
- not_implemented_node("FunctionNodeSwitch"),
- NodeItem("FunctionNodeCombineStrings"),
- NodeItem("FunctionNodeRandomFloat"),
- ]),
SimulationNodeCategory("SIM_GROUP", "Group", items=node_group_items),
SimulationNodeCategory("SIM_LAYOUT", "Layout", items=[
NodeItem("NodeFrame"),