[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16658] trunk/blender/source/blender/src/ editobject.c: Bugfix where copy-protection of several modifiers like collision, softbody and particleInstance could be bypassed by using ctrl-c + ' copy all' option.

[Daniel Genrich]

Revision: 16658
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16658
Author:   genscher
Date:     2008-09-22 00:47:50 +0200 (Mon, 22 Sep 2008)

Log Message:
-----------
Bugfix where copy-protection of several modifiers like collision, softbody and particleInstance could be bypassed by using ctrl-c + 'copy all' option.

Modified Paths:
--------------
    trunk/blender/source/blender/src/editobject.c

Modified: trunk/blender/source/blender/src/editobject.c
===================================================================
--- trunk/blender/source/blender/src/editobject.c	2008-09-21 21:41:27 UTC (rev 16657)
+++ trunk/blender/source/blender/src/editobject.c	2008-09-21 22:47:50 UTC (rev 16658)
@@ -3306,6 +3306,9 @@
 		ModifierTypeInfo *mti = modifierType_getInfo(i);
 
 		if(ELEM3(i, eModifierType_Hook, eModifierType_Softbody, eModifierType_ParticleInstance)) continue;
+		
+		if(i == eModifierType_Collision)
+			continue;
 
 		if (	(mti->flags&eModifierTypeFlag_AcceptsCVs) || 
 				(ob->type==OB_MESH && (mti->flags&eModifierTypeFlag_AcceptsMesh))) {
@@ -3329,11 +3332,14 @@
 						object_free_modifiers(base->object);
 
 						for (md=ob->modifiers.first; md; md=md->next) {
-							if (md->type!=eModifierType_Hook) {
-								ModifierData *nmd = modifier_new(md->type);
-								modifier_copyData(md, nmd);
-								BLI_addtail(&base->object->modifiers, nmd);
-							}
+							if(ELEM3(md->type, eModifierType_Hook, eModifierType_Softbody, eModifierType_ParticleInstance)) continue;
+		
+							if(md->type == eModifierType_Collision)
+								continue;
+							
+							ModifierData *nmd = modifier_new(md->type);
+							modifier_copyData(md, nmd);
+							BLI_addtail(&base->object->modifiers, nmd);
 						}
 
 						copy_object_particlesystems(base->object, ob);