[Bf-blender-cvs] [39577403d3] master: Fix compilation error with legacy depsgraph disabled

[Sergey Sharybin]

Commit: 39577403d3c421f51735613810ffcb4acc1e3894
Author: Sergey Sharybin
Date:   Mon Jan 23 18:08:41 2017 +0100
Branches: master
https://developer.blender.org/rB39577403d3c421f51735613810ffcb4acc1e3894

Fix compilation error with legacy depsgraph disabled

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

M       source/blender/modifiers/CMakeLists.txt
M       source/blender/modifiers/intern/MOD_cloth.c
M       source/blender/modifiers/intern/MOD_dynamicpaint.c
M       source/blender/modifiers/intern/MOD_smoke.c
M       source/blender/modifiers/intern/MOD_softbody.c

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

diff --git a/source/blender/modifiers/CMakeLists.txt 
b/source/blender/modifiers/CMakeLists.txt
index b8ebb375a4..bacfc17743 100644
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@ -113,6 +113,10 @@ set(SRC
        intern/MOD_weightvg_util.h
 )
 
+if(WITH_LEGACY_DEPSGRAPH)
+       add_definitions(-DWITH_LEGACY_DEPSGRAPH)
+endif()
+
 if(WITH_ALEMBIC)
        add_definitions(-DWITH_ALEMBIC)
        list(APPEND INC
diff --git a/source/blender/modifiers/intern/MOD_cloth.c 
b/source/blender/modifiers/intern/MOD_cloth.c
index d15a6fcb1c..ac75b4dbee 100644
--- a/source/blender/modifiers/intern/MOD_cloth.c
+++ b/source/blender/modifiers/intern/MOD_cloth.c
@@ -125,9 +125,15 @@ static void updateDepgraph(ModifierData *md, DagForest 
*forest,
        
        if (clmd) {
                /* Actual code uses get_collisionobjects */
+#ifdef WITH_LEGACY_DEPSGRAPH
                dag_add_collision_relations(forest, scene, ob, obNode, 
clmd->coll_parms->group, ob->lay|scene->lay, eModifierType_Collision, NULL, 
true, "Cloth Collision");
-
                dag_add_forcefield_relations(forest, scene, ob, obNode, 
clmd->sim_parms->effector_weights, true, 0, "Cloth Field");
+#else
+       (void)forest;
+       (void)scene;
+       (void)ob;
+       (void)obNode;
+#endif
        }
 }
 
diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.c 
b/source/blender/modifiers/intern/MOD_dynamicpaint.c
index bde20e5674..b49a407da7 100644
--- a/source/blender/modifiers/intern/MOD_dynamicpaint.c
+++ b/source/blender/modifiers/intern/MOD_dynamicpaint.c
@@ -129,6 +129,7 @@ static void updateDepgraph(ModifierData *md, DagForest 
*forest,
 
        /* add relation from canvases to all brush objects */
        if (pmd && pmd->canvas) {
+#ifdef WITH_LEGACY_DEPSGRAPH
                for (DynamicPaintSurface *surface = 
pmd->canvas->surfaces.first; surface; surface = surface->next) {
                        if (surface->effect & MOD_DPAINT_EFFECT_DO_DRIP) {
                                dag_add_forcefield_relations(forest, scene, ob, 
obNode, surface->effector_weights, true, 0, "Dynamic Paint Field");
@@ -137,6 +138,12 @@ static void updateDepgraph(ModifierData *md, DagForest 
*forest,
                        /* Actual code uses custom loop over group/scene 
without layer checks in dynamicPaint_doStep */
                        dag_add_collision_relations(forest, scene, ob, obNode, 
surface->brush_group, -1, eModifierType_DynamicPaint, is_brush_cb, false, 
"Dynamic Paint Brush");
                }
+#else
+       (void)forest;
+       (void)scene;
+       (void)ob;
+       (void)obNode;
+#endif
        }
 }
 
diff --git a/source/blender/modifiers/intern/MOD_smoke.c 
b/source/blender/modifiers/intern/MOD_smoke.c
index f04d7432a8..a7b23ae240 100644
--- a/source/blender/modifiers/intern/MOD_smoke.c
+++ b/source/blender/modifiers/intern/MOD_smoke.c
@@ -138,10 +138,16 @@ static void updateDepgraph(ModifierData *md, DagForest 
*forest,
 
        if (smd && (smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) {
                /* Actual code uses get_collisionobjects */
+#ifdef WITH_LEGACY_DEPSGRAPH
                dag_add_collision_relations(forest, scene, ob, obNode, 
smd->domain->fluid_group, ob->lay|scene->lay, eModifierType_Smoke, is_flow_cb, 
true, "Smoke Flow");
                dag_add_collision_relations(forest, scene, ob, obNode, 
smd->domain->coll_group, ob->lay|scene->lay, eModifierType_Smoke, is_coll_cb, 
true, "Smoke Coll");
-
                dag_add_forcefield_relations(forest, scene, ob, obNode, 
smd->domain->effector_weights, true, PFIELD_SMOKEFLOW, "Smoke Force Field");
+#else
+       (void)forest;
+       (void)scene;
+       (void)ob;
+       (void)obNode;
+#endif
        }
 }
 
diff --git a/source/blender/modifiers/intern/MOD_softbody.c 
b/source/blender/modifiers/intern/MOD_softbody.c
index 17adc7f152..a0bbe5da04 100644
--- a/source/blender/modifiers/intern/MOD_softbody.c
+++ b/source/blender/modifiers/intern/MOD_softbody.c
@@ -67,10 +67,17 @@ static void updateDepgraph(ModifierData *UNUSED(md), 
DagForest *forest,
                            Scene *scene, Object *ob, DagNode *obNode)
 {
        if (ob->soft) {
+#ifdef WITH_LEGACY_DEPSGRAPH
                /* Actual code uses ccd_build_deflector_hash */
                dag_add_collision_relations(forest, scene, ob, obNode, 
ob->soft->collision_group, ob->lay, eModifierType_Collision, NULL, false, 
"Softbody Collision");
 
                dag_add_forcefield_relations(forest, scene, ob, obNode, 
ob->soft->effector_weights, true, 0, "Softbody Field");
+#else
+       (void)forest;
+       (void)scene;
+       (void)ob;
+       (void)obNode;
+#endif
        }
 }

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