[Bf-blender-cvs] [82fb06a2fcf] temp-greasepencil-object-stacksplit: Remove scene from GpencilModifierData struct

Antonio Vazquez noreply at git.blender.org
Wed Jun 20 10:37:37 CEST 2018


Commit: 82fb06a2fcf0d689a7e6adb773648cab36381e00
Author: Antonio Vazquez
Date:   Wed Jun 20 10:36:58 2018 +0200
Branches: temp-greasepencil-object-stacksplit
https://developer.blender.org/rB82fb06a2fcf0d689a7e6adb773648cab36381e00

Remove scene from GpencilModifierData struct

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

M	source/blender/blenloader/intern/readfile.c
M	source/blender/editors/interface/interface_templates.c
M	source/blender/editors/object/object_gpencil_modifier.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
M	source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
M	source/blender/makesdna/DNA_gpencil_modifier_types.h

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 6f00cbf0618..2f53b467418 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5399,7 +5399,6 @@ static void direct_link_gpencil_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/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index ba3342aa29c..7e66ea20db7 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1563,7 +1563,6 @@ static uiLayout *gpencil_draw_modifier(uiLayout *layout, Scene *scene, Object *o
 	UI_block_emboss_set(block, UI_EMBOSS);
 
 	/* modifier name */
-	md->scene = scene;
 	if (mti->isDisabled && mti->isDisabled(md, 0)) {
 		uiLayoutSetRedAlert(row, true);
 	}
diff --git a/source/blender/editors/object/object_gpencil_modifier.c b/source/blender/editors/object/object_gpencil_modifier.c
index 7c9dc188457..7eaafb08529 100644
--- a/source/blender/editors/object/object_gpencil_modifier.c
+++ b/source/blender/editors/object/object_gpencil_modifier.c
@@ -207,8 +207,6 @@ static int gpencil_modifier_apply_obdata(ReportList *reports, Main *bmain, Depsg
 {
 	const GpencilModifierTypeInfo *mti = BKE_gpencil_modifierType_getInfo(md->type);
 
-	md->scene = scene;
-
 	if (mti->isDisabled && mti->isDisabled(md, 0)) {
 		BKE_report(reports, RPT_ERROR, "Modifier is disabled, skipping apply");
 		return 0;
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
index 0c94e3a4458..9d4e3aba8b3 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
@@ -269,7 +269,7 @@ static void gp_bakeModifier(
         GpencilModifierData *md, Object *ob)
 {
 	HookGpencilModifierData *mmd = (HookGpencilModifierData *)md;
-	Scene *scene = md->scene;
+	Scene *scene = DEG_get_evaluated_scene(depsgraph);
 	bGPdata *gpd = ob->data;
 	int oldframe = (int)DEG_get_ctime(depsgraph);
 
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
index 755c97b59e0..7b05046b5d8 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilinstance.c
@@ -54,6 +54,7 @@
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_query.h"
 
 #include "MOD_gpencil_util.h"
 #include "MOD_gpencil_modifiertypes.h"
@@ -231,10 +232,10 @@ static Object *array_instance_add_ob_copy(Main *bmain, Scene *scene, Object *fro
 }
 
 /* gp_bakeModifier - "Make Objects" Mode */
-static void bakeModifierGP_objects(Main *bmain, GpencilModifierData *md, Object *ob)
+static void bakeModifierGP_objects(Main *bmain, Depsgraph *depsgraph, GpencilModifierData *md, Object *ob)
 {
 	InstanceGpencilModifierData *mmd = (InstanceGpencilModifierData *)md;
-	Scene *scene = md->scene;
+	Scene *scene = DEG_get_evaluated_scene(depsgraph);
 	/* reset random */
 	mmd->rnd[0] = 1;
 
@@ -328,7 +329,7 @@ static void gp_bakeModifier(
 	 * Sometimes it's useful to have the option to do either of these...
 	 */
 	if (mmd->flag & GP_INSTANCE_MAKE_OBJECTS) {
-		bakeModifierGP_objects(bmain, md, ob);
+		bakeModifierGP_objects(bmain, depsgraph, md, ob);
 	}
 	else {
 		bakeModifierGP_strokes(depsgraph, md, ob);
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
index 6a27a4a951e..b48c8006e75 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
@@ -115,7 +115,7 @@ static void gp_bakeModifier(
         GpencilModifierData *md, Object *ob)
 {
 	LatticeGpencilModifierData *mmd = (LatticeGpencilModifierData *)md;
-	Scene *scene = md->scene;
+	Scene *scene = DEG_get_evaluated_scene(depsgraph);
 	struct LatticeDeformData *ldata = NULL;
 	bGPdata *gpd = ob->data;
 	int oldframe = (int)DEG_get_ctime(depsgraph);
diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
index 4723c1a9b78..1c0b6c94c04 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
@@ -93,7 +93,7 @@ static void gp_deformStroke(
 	float shift, vran, vdir;
 	float normal[3];
 	float vec1[3], vec2[3];
-	Scene *scene = NULL;
+	Scene *scene = DEG_get_evaluated_scene(depsgraph);
 	int sc_frame = 0;
 	int sc_diff = 0;
 	int vindex = defgroup_name_index(ob, mmd->vgname);
@@ -106,7 +106,6 @@ static void gp_deformStroke(
 		return;
 	}
 
-	scene = mmd->modifier.scene;
 	sc_frame = (int)DEG_get_ctime(depsgraph);
 
 	zero_v3(vec2);
diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h
index 75e7782468d..a3557391da7 100644
--- a/source/blender/makesdna/DNA_gpencil_modifier_types.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h
@@ -71,8 +71,6 @@ typedef struct GpencilModifierData {
 	short pad;
 	char name[64];  /* MAX_NAME */
 
-	struct Scene *scene;
-
 	char *error;
 } GpencilModifierData;



More information about the Bf-blender-cvs mailing list