[Bf-blender-cvs] [888fb065a4c] blender2.8: Modifiers: Remove remaining parts of md->scene

[Sergey Sharybin]

Commit: 888fb065a4c2494eb3ec94f734194843d7b03118
Author: Sergey Sharybin
Date:   Fri Jun 22 15:04:06 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB888fb065a4c2494eb3ec94f734194843d7b03118

Modifiers: Remove remaining parts of md->scene

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

M	source/blender/blenkernel/intern/DerivedMesh.c
M	source/blender/blenkernel/intern/displist.c
M	source/blender/blenkernel/intern/lattice.c
M	source/blender/blenkernel/intern/mesh_convert.c
M	source/blender/blenloader/intern/readfile.c
M	source/blender/editors/object/object_modifier.c
M	source/blender/makesdna/DNA_modifier_types.h

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

diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 4988bd41b23..19886738b00 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2093,8 +2093,6 @@ static void mesh_calc_modifiers(
 		for (; md; md = md->next, curr = curr->next) {
 			const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 
-			md->scene = scene;
-
 			if (!modifier_isEnabled(scene, md, required_mode)) {
 				continue;
 			}
@@ -2160,8 +2158,6 @@ static void mesh_calc_modifiers(
 	for (; md; md = md->next, curr = curr->next) {
 		const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 
-		md->scene = scene;
-
 		if (!modifier_isEnabled(scene, md, required_mode)) {
 			continue;
 		}
@@ -2638,8 +2634,6 @@ static void editbmesh_calc_modifiers(
 	for (i = 0; md; i++, md = md->next, curr = curr->next) {
 		const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 
-		md->scene = scene;
-
 		if (!editbmesh_modifier_is_enabled(scene, md, dm)) {
 			continue;
 		}
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c
index ad055a727a9..84bac76202a 100644
--- a/source/blender/blenkernel/intern/displist.c
+++ b/source/blender/blenkernel/intern/displist.c
@@ -855,8 +855,6 @@ static void curve_calc_modifiers_pre(
 		for (; md; md = md->next) {
 			const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 
-			md->scene = scene;
-
 			if (!modifier_isEnabled(scene, md, required_mode))
 				continue;
 			if (mti->type != eModifierTypeType_OnlyDeform)
@@ -961,7 +959,6 @@ static void curve_calc_modifiers_post(
 
 	for (; md; md = md->next) {
 		const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
-		md->scene = scene;
 
 		if (!modifier_isEnabled(scene, md, required_mode))
 			continue;
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index 03667e31e12..0af329449ca 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -1045,8 +1045,6 @@ void BKE_lattice_modifiers_calc(struct Depsgraph *depsgraph, Scene *scene, Objec
 	for (; md; md = md->next) {
 		const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 
-		md->scene = scene;
-
 		if (!(mti->flags & eModifierTypeFlag_AcceptsLattice)) continue;
 		if (!(md->mode & eModifierMode_Realtime)) continue;
 		if (editmode && !(md->mode & eModifierMode_Editmode)) continue;
diff --git a/source/blender/blenkernel/intern/mesh_convert.c b/source/blender/blenkernel/intern/mesh_convert.c
index 22919f0c4bc..c8262b1b1f3 100644
--- a/source/blender/blenkernel/intern/mesh_convert.c
+++ b/source/blender/blenkernel/intern/mesh_convert.c
@@ -1150,8 +1150,6 @@ Mesh *BKE_mesh_create_derived_for_modifier(
 	KeyBlock *kb;
 	ModifierEvalContext mectx = {depsgraph, ob, 0};
 
-	md->scene = scene;
-
 	if (!(md->mode & eModifierMode_Realtime)) {
 		return NULL;
 	}
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 3de14260ed9..37debb68ea8 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5031,7 +5031,6 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
 
 	for (md=lb->first; md; md=md->next) {
 		md->error = NULL;
-		md->scene = NULL;
 
 		/* if modifiers disappear, or for upward compatibility */
 		if (NULL == modifierType_getInfo(md->type))
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index f66a69253e8..9d7ca44ce16 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -527,8 +527,6 @@ static int modifier_apply_shape(
 {
 	const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 
-	md->scene = scene;
-
 	if (mti->isDisabled && mti->isDisabled(scene, md, 0)) {
 		BKE_report(reports, RPT_ERROR, "Modifier is disabled, skipping apply");
 		return 0;
@@ -587,8 +585,6 @@ static int modifier_apply_obdata(ReportList *reports, Depsgraph *depsgraph, Scen
 {
 	const ModifierTypeInfo *mti = modifierType_getInfo(md->type);
 
-	md->scene = scene;
-
 	if (mti->isDisabled && mti->isDisabled(scene, md, 0)) {
 		BKE_report(reports, RPT_ERROR, "Modifier is disabled, skipping apply");
 		return 0;
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index eb7fc3f4bf5..712958deca1 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -33,6 +33,7 @@
  */
 
 struct Mesh;
+struct Scene;
 
 typedef enum ModifierType {
 	eModifierType_None              = 0,
@@ -112,9 +113,6 @@ typedef struct ModifierData {
 	short pad;
 	char name[64];  /* MAX_NAME */
 
-	/* XXX for timing info set by caller... solve later? (ton) */
-	struct Scene *scene;
-
 	char *error;
 } ModifierData;