[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28351] branches/render25/source/blender/ blenkernel/intern/effect.c: fix all layers effector option, it should work on effectors themselves, not simulator objects

[Joseph Eagar]

Revision: 28351
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28351
Author:   joeedh
Date:     2010-04-22 18:37:13 +0200 (Thu, 22 Apr 2010)

Log Message:
-----------
fix all layers effector option, it should work on effectors themselves, not 
simulator objects

Modified Paths:
--------------
    branches/render25/source/blender/blenkernel/intern/effect.c

Modified: branches/render25/source/blender/blenkernel/intern/effect.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/effect.c 2010-04-22 
16:33:16 UTC (rev 28350)
+++ branches/render25/source/blender/blenkernel/intern/effect.c 2010-04-22 
16:37:13 UTC (rev 28351)
@@ -305,7 +305,7 @@
                GroupObject *go;
                
                for(go= weights->group->gobject.first; go; go= go->next) {
-                       if( (go->ob->lay & layer) ) {
+                       if( (go->ob->lay & layer) || (go->ob->restrictflag & 
OB_EFFECTS_ALL_LAYERS) ) {
                                if( go->ob->pd && go->ob->pd->forcefield )
                                        add_object_to_effectors(&effectors, 
scene, weights, go->ob, ob_src);
 
@@ -320,7 +320,7 @@
        }
        else {
                for(base = scene->base.first; base; base= base->next) {
-                       if( (base->lay & layer) ) {
+                       if( (base->lay & layer) || (base->object->restrictflag 
& OB_EFFECTS_ALL_LAYERS)) {
                                if( base->object->pd && 
base->object->pd->forcefield )
                                add_object_to_effectors(&effectors, scene, 
weights, base->object, ob_src);
 


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs