[Bf-blender-cvs] [50256da50a3] fluid-mantaflow: Merge branch 'master' into fluid-mantaflow
Sebastián Barschkis
noreply at git.blender.org
Thu Dec 12 22:46:17 CET 2019
Commit: 50256da50a35f7053c21bb866c4a88d5d625401e
Author: Sebastián Barschkis
Date: Thu Dec 12 22:46:00 2019 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB50256da50a35f7053c21bb866c4a88d5d625401e
Merge branch 'master' into fluid-mantaflow
===================================================================
===================================================================
diff --cc CMakeLists.txt
index 444366c4736,372fa8fa784..162ef67114b
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -312,9 -242,10 +242,9 @@@ endif(
# Modifiers
-option(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON)
-option(WITH_MOD_SMOKE "Enable Smoke Modifier (Smoke Simulation)" ON)
+option(WITH_MOD_MANTA "Enable Mantaflow Fluid Simulation Framework" ON)
option(WITH_MOD_REMESH "Enable Remesh Modifier" ON)
- option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" OFF)
+ option(WITH_MOD_OCEANSIM "Enable Ocean Modifier" ON)
# Image format support
option(WITH_OPENIMAGEIO "Enable OpenImageIO Support (http://www.openimageio.org)" ON)
diff --cc build_files/cmake/config/blender_full.cmake
index 6187fe78c52,fae15ea979b..5c7a9517c7d
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@@ -29,11 -28,11 +28,10 @@@ set(WITH_IMAGE_OPENJPEG ON CACHE
set(WITH_IMAGE_TIFF ON CACHE BOOL "" FORCE)
set(WITH_INPUT_NDOF ON CACHE BOOL "" FORCE)
set(WITH_INTERNATIONAL ON CACHE BOOL "" FORCE)
- set(WITH_JACK ON CACHE BOOL "" FORCE)
set(WITH_LZMA ON CACHE BOOL "" FORCE)
set(WITH_LZO ON CACHE BOOL "" FORCE)
-set(WITH_MOD_FLUID ON CACHE BOOL "" FORCE)
set(WITH_MOD_REMESH ON CACHE BOOL "" FORCE)
-set(WITH_MOD_SMOKE ON CACHE BOOL "" FORCE)
+set(WITH_MOD_MANTA ON CACHE BOOL "" FORCE)
set(WITH_MOD_OCEANSIM ON CACHE BOOL "" FORCE)
set(WITH_AUDASPACE ON CACHE BOOL "" FORCE)
set(WITH_OPENAL ON CACHE BOOL "" FORCE)
diff --cc build_files/cmake/config/blender_release.cmake
index 129ef873981,07d95a84112..72d56eb21f2
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@@ -30,11 -29,11 +29,10 @@@ set(WITH_IMAGE_OPENJPEG ON CACHE
set(WITH_IMAGE_TIFF ON CACHE BOOL "" FORCE)
set(WITH_INPUT_NDOF ON CACHE BOOL "" FORCE)
set(WITH_INTERNATIONAL ON CACHE BOOL "" FORCE)
- set(WITH_JACK ON CACHE BOOL "" FORCE)
set(WITH_LZMA ON CACHE BOOL "" FORCE)
set(WITH_LZO ON CACHE BOOL "" FORCE)
-set(WITH_MOD_FLUID ON CACHE BOOL "" FORCE)
set(WITH_MOD_REMESH ON CACHE BOOL "" FORCE)
-set(WITH_MOD_SMOKE ON CACHE BOOL "" FORCE)
+set(WITH_MOD_MANTA ON CACHE BOOL "" FORCE)
set(WITH_MOD_OCEANSIM ON CACHE BOOL "" FORCE)
set(WITH_AUDASPACE ON CACHE BOOL "" FORCE)
set(WITH_OPENAL ON CACHE BOOL "" FORCE)
diff --cc release/scripts/startup/bl_ui/space_userpref.py
index e86eaac9c33,bf39cbda391..666d98e5fb2
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@@ -2159,12 -2183,14 +2183,13 @@@ class USERPREF_PT_experimental_ui(Exper
prefs = context.preferences
experimental = prefs.experimental
- col = layout.column()
- col.prop(experimental, "use_experimental_all")
-
- # For the other settings create new panels
- # and make sure they are disabled if use_experimental_all is True
+ task = "T66304"
+ split = layout.split(factor=0.66)
+ col = split.column()
+ col.prop(experimental, "use_tool_fallback", text="Use Tool Fallback")
+ col = split.column()
+ col.operator("wm.url_open", text=task, icon='URL').url = self.url_prefix + task
-
"""
# Example panel, leave it here so we always have a template to follow even
# after the features are gone from the experimental panel.
diff --cc source/blender/makesdna/DNA_modifier_types.h
index 424dd2b5617,0b61e312846..2c4ae866c01
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@@ -86,7 -86,7 +86,8 @@@ typedef enum ModifierType
eModifierType_MeshSequenceCache = 52,
eModifierType_SurfaceDeform = 53,
eModifierType_WeightedNormal = 54,
- eModifierType_Manta = 55,
+ eModifierType_Weld = 55,
++ eModifierType_Manta = 56,
NUM_MODIFIER_TYPES,
} ModifierType;
diff --cc source/blender/makesrna/intern/rna_modifier.c
index 3db25e96e08,3759b721152..8af4d5ec65f
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@@ -134,15 -270,24 +270,23 @@@ const EnumPropertyItem rna_enum_object_
{eModifierType_Cloth, "CLOTH", ICON_MOD_CLOTH, "Cloth", ""},
{eModifierType_Collision, "COLLISION", ICON_MOD_PHYSICS, "Collision", ""},
{eModifierType_DynamicPaint, "DYNAMIC_PAINT", ICON_MOD_DYNAMICPAINT, "Dynamic Paint", ""},
- {eModifierType_Explode, "EXPLODE", ICON_MOD_EXPLODE, "Explode", ""},
- {eModifierType_Ocean, "OCEAN", ICON_MOD_OCEAN, "Ocean", ""},
+ {eModifierType_Explode,
+ "EXPLODE",
+ ICON_MOD_EXPLODE,
+ "Explode",
+ "Break apart the mesh faces and let them follow particles"},
- {eModifierType_Fluidsim, "FLUID_SIMULATION", ICON_MOD_FLUIDSIM, "Fluid Simulation", ""},
+ {eModifierType_Ocean, "OCEAN", ICON_MOD_OCEAN, "Ocean", "Generate a moving ocean surface"},
{eModifierType_ParticleInstance,
"PARTICLE_INSTANCE",
ICON_MOD_PARTICLE_INSTANCE,
"Particle Instance",
""},
- {eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, "Particle System", ""},
+ {eModifierType_ParticleSystem,
+ "PARTICLE_SYSTEM",
+ ICON_MOD_PARTICLES,
+ "Particle System",
+ "Spawn particles from the shape"},
- {eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, "Smoke", ""},
+ {eModifierType_Manta, "FLUID", ICON_MOD_MANTA, "Fluid Simulation", ""},
{eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""},
{eModifierType_Surface, "SURFACE", ICON_MODIFIER, "Surface", ""},
{0, NULL, 0, NULL, NULL},
More information about the Bf-blender-cvs
mailing list