[Bf-blender-cvs] [f5608c36554] greasepencil-object: Cleanup: Remove redundant parameter

Antonio Vazquez noreply at git.blender.org
Mon Apr 30 14:08:03 CEST 2018


Commit: f5608c365549a58d92b5fa8ed1ae382fac9273ed
Author: Antonio Vazquez
Date:   Mon Apr 30 14:07:54 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf5608c365549a58d92b5fa8ed1ae382fac9273ed

Cleanup: Remove redundant parameter

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

M	source/blender/editors/gpencil/gpencil_add_monkey.c
M	source/blender/editors/include/ED_gpencil.h
M	source/blender/editors/object/object_add.c

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

diff --git a/source/blender/editors/gpencil/gpencil_add_monkey.c b/source/blender/editors/gpencil/gpencil_add_monkey.c
index 64d1f9b1bc6..d37387065f2 100644
--- a/source/blender/editors/gpencil/gpencil_add_monkey.c
+++ b/source/blender/editors/gpencil/gpencil_add_monkey.c
@@ -1419,12 +1419,12 @@ static const ColorTemplate gp_monkey_pct_pupils = {
 /* Monkey API */
 
 /* add a 2D Suzanne (original model created by Matias Mendiola) */
-void ED_gpencil_create_monkey(bContext *C, bGPdata *gpd, float mat[4][4])
+void ED_gpencil_create_monkey(bContext *C, float mat[4][4])
 {
 	Scene *scene = CTX_data_scene(C);
 	Main *bmain = CTX_data_main(C);
 	Object *ob = CTX_data_active_object(C);
-
+	bGPdata *gpd = (bGPdata *)ob->data;
 	bGPDstroke *gps;
 	
 	/* create colors */
diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index f47d61ce149..ea17df407c5 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -188,7 +188,7 @@ void ED_gpencil_brush_draw_eraser(struct Brush *brush, int x, int y);
 
 /* ----------- Add Primitive Utilities -------------- */
 
-void ED_gpencil_create_monkey(struct bContext *C, struct bGPdata *gpd, float mat[4][4]);
+void ED_gpencil_create_monkey(struct bContext *C, float mat[4][4]);
 
 /* ------------ Object Utilities ------------ */
 struct Object *ED_add_gpencil_object(struct bContext *C, struct Scene *scene, const float loc[3]);
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index ef479a0c0bc..86ae5acb0e3 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1040,7 +1040,7 @@ static int object_gpencil_add_exec(bContext *C, wmOperator *op)
 			mul_v3_fl(mat[1], radius);
 			mul_v3_fl(mat[2], radius);
 			
-			ED_gpencil_create_monkey(C, gpd, mat);
+			ED_gpencil_create_monkey(C, mat);
 			break;
 		}



More information about the Bf-blender-cvs mailing list