[Bf-blender-cvs] [d62f6de0a45] fluid-mantaflow: Mantaflow: Remove particle type additions from previous commit

Sebastián Barschkis noreply at git.blender.org
Mon Aug 26 01:34:30 CEST 2019


Commit: d62f6de0a453a93c1f9854c7abb11742f5f1d4f4
Author: Sebastián Barschkis
Date:   Mon Aug 26 01:34:21 2019 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBd62f6de0a453a93c1f9854c7abb11742f5f1d4f4

Mantaflow: Remove particle type additions from previous commit

Generated warning from bpy_rna.c should be safe to ignore for now

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

M	source/blender/makesrna/intern/rna_particle.c

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

diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 65dc6aeec08..969092065b0 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -2246,12 +2246,6 @@ static void rna_def_particle_settings(BlenderRNA *brna)
       {PART_EMITTER, "EMITTER", 0, "Emitter", ""},
       /*{PART_REACTOR, "REACTOR", 0, "Reactor", ""}, */
       {PART_HAIR, "HAIR", 0, "Hair", ""},
-      {PART_FLUID, "FLUID", 0, "Fluid", ""},
-      {PART_MANTA_FLIP, "FLIP", 0, "FLIP", ""},
-      {PART_MANTA_SPRAY, "SPRAY", 0, "Spray", ""},
-      {PART_MANTA_BUBBLE, "BUBBLE", 0, "Bubble", ""},
-      {PART_MANTA_FOAM, "FOAM", 0, "Foam", ""},
-      {PART_MANTA_TRACER, "TRACER", 0, "Tracer", ""},
       {0, NULL, 0, NULL, NULL},
   };



More information about the Bf-blender-cvs mailing list