[Bf-blender-cvs] [3d1c0afe0e6] master: Depsgraph: Remove unused bmain from modifiers relations update context
Sergey Sharybin
noreply at git.blender.org
Thu Feb 22 14:07:38 CET 2018
Commit: 3d1c0afe0e6cf12c00b761431360d7a0347c91cc
Author: Sergey Sharybin
Date: Thu Feb 22 14:07:08 2018 +0100
Branches: master
https://developer.blender.org/rB3d1c0afe0e6cf12c00b761431360d7a0347c91cc
Depsgraph: Remove unused bmain from modifiers relations update context
===================================================================
M source/blender/blenkernel/BKE_modifier.h
M source/blender/blenkernel/intern/depsgraph.c
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h
index c4dc4998e35..b5f72b0774e 100644
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@ -128,7 +128,6 @@ typedef enum ModifierApplyFlag {
typedef struct ModifierUpdateDepsgraphContext {
- struct Main *bmain;
struct Scene *scene;
struct Object *object;
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 99e4a3ab9da..dee8585462c 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -646,7 +646,6 @@ static void build_dag_object(DagForest *dag, DagNode *scenenode, Main *bmain, Sc
if (ob->modifiers.first) {
ModifierData *md;
ModifierUpdateDepsgraphContext ctx = {
- .bmain = bmain,
.scene = scene,
.object = ob,
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index abb1e3674a7..0d85b1dfc93 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1540,7 +1540,6 @@ void DepsgraphRelationBuilder::build_obdata_geom(Object *object)
DEG_NODE_TYPE_GEOMETRY,
DEG_OPCODE_GEOMETRY_UBEREVAL);
ModifierUpdateDepsgraphContext ctx = {};
- ctx.bmain = bmain_;
ctx.scene = scene_;
ctx.object = object;
More information about the Bf-blender-cvs
mailing list