[Bf-blender-cvs] [052f0c68a6d] fluid-mantaflow: Mantaflow: Small fixes for a clean console

Sebastián Barschkis noreply at git.blender.org
Mon Aug 26 00:50:32 CEST 2019


Commit: 052f0c68a6d02dd0cbe653dc9083d273ca38ef54
Author: Sebastián Barschkis
Date:   Mon Aug 26 00:09:06 2019 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB052f0c68a6d02dd0cbe653dc9083d273ca38ef54

Mantaflow: Small fixes for a clean console

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

M	release/scripts/startup/bl_ui/properties_particle.py
M	source/blender/makesrna/intern/rna_particle.c

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

diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py
index 9fcb5ec928f..80f9255217d 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -55,7 +55,7 @@ def particle_panel_poll(cls, context):
     if not settings:
         return False
 
-    return (settings.is_fluid is False) and (settings.is_manta is False) and (engine in cls.COMPAT_ENGINES)
+    return (settings.is_manta is False) and (engine in cls.COMPAT_ENGINES)
 
 
 def particle_get_settings(context):
@@ -190,7 +190,7 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel, Panel):
 
             layout.template_ID(context.space_data, "pin_id")
 
-            if part.is_fluid or part.is_manta:
+            if part.is_manta:
                 layout.label(text="Settings used for fluid")
                 return
 
@@ -203,12 +203,12 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel, Panel):
 
             col = layout.column()
 
-            if (part.is_fluid is False) and (part.is_manta is False):
+            if (part.is_manta is False):
                 row = col.row()
                 row.enabled = particle_panel_enabled(context, psys)
                 row.template_ID(psys, "settings", new="particle.new")
 
-            if part.is_fluid or part.is_manta:
+            if part.is_manta:
                 layout.label(text=iface_("%d fluid particles for this frame") % part.count, translate=False)
                 return
 
@@ -253,7 +253,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, Panel):
 
         if settings is None:
             return False
-        if settings.is_fluid or settings.is_manta:
+        if settings.is_manta:
             return False
         if particle_panel_poll(PARTICLE_PT_emission, context):
             return psys is None or not context.particle_system.point_cache.use_external
@@ -487,7 +487,7 @@ class PARTICLE_PT_cache(ParticleButtonsPanel, Panel):
             return False
         if psys.settings is None:
             return False
-        if psys.settings.is_fluid or psys.settings.is_manta:
+        if psys.settings.is_manta:
             return False
         phystype = psys.settings.physics_type
         if phystype in {'NO', 'KEYED'}:
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index cbc32d5c9bf..9ea38a7a437 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -2245,6 +2245,12 @@ 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