[Bf-blender-cvs] [98bc64731fa] greasepencil-object: Cleanup: fix error w/ const arg

Campbell Barton noreply at git.blender.org
Tue May 15 09:38:11 CEST 2018


Commit: 98bc64731fa1464565e75df9494e9bdb38f3f9ab
Author: Campbell Barton
Date:   Tue May 15 09:37:41 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB98bc64731fa1464565e75df9494e9bdb38f3f9ab

Cleanup: fix error w/ const arg

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

M	source/blender/draw/engines/gpencil/gpencil_draw_utils.c
M	source/blender/editors/gpencil/gpencil_utils.c
M	source/blender/editors/include/ED_gpencil.h

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 6bd52df5306..353f64a4d18 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -1127,7 +1127,6 @@ void DRW_gpencil_populate_multiedit(GPENCIL_e_data *e_data, void *vedata, Scene
 void DRW_gpencil_populate_datablock(GPENCIL_e_data *e_data, void *vedata, Scene *scene, Object *ob, bGPdata *gpd)
 {
 	GPENCIL_StorageList *stl = ((GPENCIL_Data *)vedata)->stl;
-	const DRWContextState *draw_ctx = DRW_context_state_get();
 	ToolSettings *ts = scene->toolsettings;
 	bGPDframe *derived_gpf = NULL;
 	bool no_onion = (bool)(gpd->flag & GP_DATA_STROKE_WEIGHTMODE);
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index 6ff682cbcb4..cb1fa39e09b 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -1047,8 +1047,9 @@ void gp_randomize_stroke(bGPDstroke *gps, Brush *brush)
 /* Layer Parenting  - Compute Parent Transforms */
 
 /* calculate difference matrix */
-void ED_gpencil_parent_location(Depsgraph *depsgraph, Object *obact, bGPdata *gpd, 
-								bGPDlayer *gpl, float diff_mat[4][4])
+void ED_gpencil_parent_location(
+        const Depsgraph *depsgraph, Object *obact, bGPdata *gpd,
+        bGPDlayer *gpl, float diff_mat[4][4])
 {
 	Object *ob_eval = depsgraph != NULL ? DEG_get_evaluated_object(depsgraph, obact) : obact;
 	Object *obparent = gpl->parent;
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 166c1265fcc..480f8b05df1 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -181,8 +181,9 @@ int ED_undo_gpencil_step(struct bContext *C, int step, const char *name);
 /* ------------ Transformation Utilities ------------ */
 
 /* get difference matrix */
-void ED_gpencil_parent_location(struct Depsgraph *depsgraph, struct Object *obact, struct bGPdata *gpd, 
-								struct bGPDlayer *gpl, float diff_mat[4][4]);
+void ED_gpencil_parent_location(
+        const struct Depsgraph *depsgraph, struct Object *obact, struct bGPdata *gpd,
+        struct bGPDlayer *gpl, float diff_mat[4][4]);
 /* reset parent matrix for all layers */
 void ED_gpencil_reset_layers_parent(struct Depsgraph *depsgraph, struct Object *obact, struct bGPdata *gpd);



More information about the Bf-blender-cvs mailing list