archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2017-10-18 17:09:41 +11:00
parent 54f9a6e5da ab7ebf2b10
commit ec2bbc90e7
183 changed files with 1412 additions and 1371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/makesrna/intern/rna_fluidsim.c
View File

@@ -215,7 +215,7 @@ static void rna_def_fluidsim_slip(StructRNA *srna)
{
PropertyRNA *prop;
static EnumPropertyItem slip_items[] = {
static const EnumPropertyItem slip_items[] = {
{OB_FSBND_NOSLIP, "NOSLIP", 0, "No Slip",
"Obstacle causes zero normal and tangential velocity (=sticky), default for all "
"(only option for moving objects)"},
@@ -261,7 +261,7 @@ static void rna_def_fluidsim_domain(BlenderRNA *brna)
StructRNA *srna;
PropertyRNA *prop;
static EnumPropertyItem quality_items[] = {
static const EnumPropertyItem quality_items[] = {
{OB_FSDOM_GEOM, "GEOMETRY", 0, "Geometry", "Display geometry"},
{OB_FSDOM_PREVIEW, "PREVIEW", 0, "Preview", "Display preview quality results"},
{OB_FSDOM_FINAL, "FINAL", 0, "Final", "Display final quality results"},
@@ -445,7 +445,7 @@ static void rna_def_fluidsim_volume(StructRNA *srna)
{
PropertyRNA *prop;
static EnumPropertyItem volume_type_items[] = {
static const EnumPropertyItem volume_type_items[] = {
{1, "VOLUME", 0, "Volume", "Use only the inner volume of the mesh"},
{2, "SHELL", 0, "Shell", "Use only the outer shell of the mesh"},
{3, "BOTH", 0, "Both", "Use both the inner volume and the outer shell of the mesh"},
@@ -668,7 +668,7 @@ void RNA_def_fluidsim(BlenderRNA *brna)
StructRNA *srna;
PropertyRNA *prop;
static EnumPropertyItem prop_fluid_type_items[] = {
static const EnumPropertyItem prop_fluid_type_items[] = {
{OB_FLUIDSIM_ENABLE, "NONE", 0, "None", ""},
{OB_FLUIDSIM_DOMAIN, "DOMAIN", 0, "Domain",
"Bounding box of this object represents the computational domain of the "