[Bf-blender-cvs] [1dbaf88150c] fracture_modifier: fix, possibly return an empty mesh and default psys index is 1 now

[Martin Felke]

Commit: 1dbaf88150c879440989ad9a2cd009b5b05eeab5
Author: Martin Felke
Date:   Sat Dec 30 02:14:52 2017 +0100
Branches: fracture_modifier
https://developer.blender.org/rB1dbaf88150c879440989ad9a2cd009b5b05eeab5

fix, possibly return an empty mesh and default psys index is 1 now

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

M	source/blender/blenkernel/intern/mball_tessellate.c
M	source/blender/makesrna/intern/rna_modifier.c
M	source/blender/modifiers/intern/MOD_remesh.c

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

diff --git a/source/blender/blenkernel/intern/mball_tessellate.c b/source/blender/blenkernel/intern/mball_tessellate.c
index e20616e0b17..f4033bad83a 100644
--- a/source/blender/blenkernel/intern/mball_tessellate.c
+++ b/source/blender/blenkernel/intern/mball_tessellate.c
@@ -1610,6 +1610,9 @@ DerivedMesh* BKE_repolygonize_dm(DerivedMesh *dm, float thresh, float basesize[3
 		}
 	}
 
+	if (!result)
+		result = CDDM_new(0, 0, 0, 0, 0); //return an empty mesh
+
 	freepolygonize(&process);
 
 	return result;
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 5e8e3dd677d..32e465404d7 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -3960,7 +3960,7 @@ static void rna_def_modifier_remesh(BlenderRNA *brna)
 
 	prop = RNA_def_property(srna, "psys", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "psys");
-	RNA_def_property_range(prop, 0, INT_MAX);
+	RNA_def_property_range(prop, 1, INT_MAX);
 	RNA_def_property_ui_text(prop, "Particle System Index", "Index of the input particle system to use");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 
diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c
index 5806835fbc5..01f1d6a68b5 100644
--- a/source/blender/modifiers/intern/MOD_remesh.c
+++ b/source/blender/modifiers/intern/MOD_remesh.c
@@ -68,7 +68,7 @@ static void initData(ModifierData *md)
 
 	rmd->input = 0;
 	rmd->pflag = 1;
-	rmd->psys = 0;
+	rmd->psys = 1;
 }
 
 static void copyData(ModifierData *md, ModifierData *target)