[Bf-blender-cvs] [f71cd9fb1a7] greasepencil-object: Cleanup: Rename depsgraph variable

Antonio Vazquez noreply at git.blender.org
Tue May 29 12:50:10 CEST 2018


Commit: f71cd9fb1a7542ca3809bcc6eeefe96a966c9bb0
Author: Antonio Vazquez
Date:   Tue May 29 12:49:40 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf71cd9fb1a7542ca3809bcc6eeefe96a966c9bb0

Cleanup: Rename depsgraph variable

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

M	source/blender/editors/gpencil/gpencil_intern.h
M	source/blender/editors/gpencil/gpencil_primitive.c

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

diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index 5ccbb9e1003..d8b7df16c17 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -137,7 +137,7 @@ typedef struct tGPDinterpolate {
 
 /* Temporary primitive operation data */
 typedef struct tGPDprimitive {
-	struct Depsgraph *graph;
+	struct Depsgraph *depsgraph;
 	struct wmWindow *win;             /* window where painting originated */
 	struct Scene *scene;              /* current scene from context */
 	struct Object *ob;                /* current active gp object */
diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c
index b1448f695ad..c50dd0d0348 100644
--- a/source/blender/editors/gpencil/gpencil_primitive.c
+++ b/source/blender/editors/gpencil/gpencil_primitive.c
@@ -372,7 +372,7 @@ static void gp_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi)
 	/* if parented change position relative to parent object */
 	for (int i = 0; i < gps->totpoints; i++) {
 		bGPDspoint *pt = &gps->points[i];
-		gp_apply_parent_point(tgpi->graph, tgpi->ob, tgpi->gpd, tgpi->gpl, pt);
+		gp_apply_parent_point(tgpi->depsgraph, tgpi->ob, tgpi->gpd, tgpi->gpl, pt);
 	}
 	
 	/* force fill recalc */
@@ -448,7 +448,7 @@ static void gpencil_primitive_init(bContext *C, wmOperator *op)
 	tgpi->ar = CTX_wm_region(C);
 	tgpi->rv3d = tgpi->ar->regiondata;
 	tgpi->v3d = tgpi->sa->spacedata.first;
-	tgpi->graph = CTX_data_depsgraph(C);
+	tgpi->depsgraph = CTX_data_depsgraph(C);
 	tgpi->win = CTX_wm_window(C);
 
 	/* set current frame number */



More information about the Bf-blender-cvs mailing list