Merging r58464 through r58474 from trunk into soc-2013-depsgraph_mt
[blender.git] / source / blender / blenkernel / intern / depsgraph.c
index 14cbca8a9a014abf96b7653ebfc03e57678c40e6..f3a824665e0e08e5348760cde1c5de1a26c94b91 100644 (file)
@@ -559,6 +559,7 @@ static void build_dag_object(DagForest *dag, DagNode *scenenode, Scene *scene, O
                                }
                                else
                                        dag_add_relation(dag, node2, node, DAG_RL_OB_OB, "Parent");
                                }
                                else
                                        dag_add_relation(dag, node2, node, DAG_RL_OB_OB, "Parent");
+                               break;
                }
                /* exception case: parent is duplivert */
                if (ob->type == OB_MBALL && (ob->parent->transflag & OB_DUPLIVERTS)) {
                }
                /* exception case: parent is duplivert */
                if (ob->type == OB_MBALL && (ob->parent->transflag & OB_DUPLIVERTS)) {
@@ -620,8 +621,8 @@ static void build_dag_object(DagForest *dag, DagNode *scenenode, Scene *scene, O
                                node2 = dag_get_node(dag, cam->dof_ob);
                                dag_add_relation(dag, node2, node, DAG_RL_OB_OB, "Camera DoF");
                        }
                                node2 = dag_get_node(dag, cam->dof_ob);
                                dag_add_relation(dag, node2, node, DAG_RL_OB_OB, "Camera DoF");
                        }
+                       break;
                }
                }
-               break;
                case OB_MBALL: 
                {
                        Object *mom = BKE_mball_basis_find(scene, ob);
                case OB_MBALL: 
                {
                        Object *mom = BKE_mball_basis_find(scene, ob);
@@ -630,8 +631,8 @@ static void build_dag_object(DagForest *dag, DagNode *scenenode, Scene *scene, O
                                node2 = dag_get_node(dag, mom);
                                dag_add_relation(dag, node, node2, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Metaball");  /* mom depends on children! */
                        }
                                node2 = dag_get_node(dag, mom);
                                dag_add_relation(dag, node, node2, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Metaball");  /* mom depends on children! */
                        }
+                       break;
                }
                }
-               break;
                case OB_CURVE:
                case OB_FONT:
                {
                case OB_CURVE:
                case OB_FONT:
                {
@@ -651,8 +652,8 @@ static void build_dag_object(DagForest *dag, DagNode *scenenode, Scene *scene, O
                                        dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Texture On Curve");
                                }
                        }
                                        dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Texture On Curve");
                                }
                        }
+                       break;
                }
                }
-               break;
        }
        
        /* material drivers */
        }
        
        /* material drivers */