[Bf-blender-cvs] [eca5449] fracture_modifier: change: let fluid move down across other modifiers in case it will be added after fracture which has a couple of other modifiers above it (exception for fluid only, since it can handle shards)

[Martin Felke]

Commit: eca5449a29766f52f6eff2eb066409aef508cf64
Author: Martin Felke
Date:   Thu Feb 11 11:55:30 2016 +0100
Branches: fracture_modifier
https://developer.blender.org/rBeca5449a29766f52f6eff2eb066409aef508cf64

change: let fluid move down across other modifiers in case it will be added after fracture which has a couple of other modifiers above it (exception for fluid only, since it can handle shards)

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

M	source/blender/editors/object/object_modifier.c

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

diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index ab9e5e0..8075a2d 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -429,7 +429,8 @@ int ED_object_modifier_move_down(ReportList *reports, Object *ob, ModifierData *
 		if (mti->flags & eModifierTypeFlag_RequiresOriginalData) {
 			const ModifierTypeInfo *nmti = modifierType_getInfo(md->next->type);
 
-			if ((nmti->type != eModifierTypeType_OnlyDeform) && (md->next->type != eModifierType_Fracture)) {
+			/*make an exception here for fluidsim, in case: it is beyond a fracture modifier and this may have some other mods above it*/
+			if ((nmti->type != eModifierTypeType_OnlyDeform) && (md->type != eModifierType_Fluidsim)) {
 				BKE_report(reports, RPT_WARNING, "Cannot move beyond a non-deforming modifier");
 				return 0;
 			}