[Bf-blender-cvs] [651e574153a] master: Cleanup: unused var, sort structs

[Campbell Barton]

Commit: 651e574153ac7295c0061f1518000cc3b1b8b4ca
Author: Campbell Barton
Date:   Fri Jun 28 10:06:57 2019 +1000
Branches: master
https://developer.blender.org/rB651e574153ac7295c0061f1518000cc3b1b8b4ca

Cleanup: unused var, sort structs

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

M	source/blender/blenkernel/BKE_pbvh.h
M	source/blender/editors/gpencil/gpencil_paint.c

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

diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index 4779a27853e..79b462e749c 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -33,9 +33,9 @@ struct CCGElem;
 struct CCGKey;
 struct CustomData;
 struct DMFlagMat;
-struct IsectRayPrecalc;
 struct GPUBatch;
 struct GPU_PBVH_Buffers;
+struct IsectRayPrecalc;
 struct MLoop;
 struct MLoopTri;
 struct MPoly;
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index b717751d434..f6691f4813b 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -2472,6 +2472,7 @@ static int gpencil_draw_init(bContext *C, wmOperator *op, const wmEvent *event)
 /* ensure that the correct cursor icon is set */
 static void gpencil_draw_cursor_set(tGPsdata *p)
 {
+  UNUSED_VARS(p);
   return;
   /* Disable while we get a better cursor handling for direct input devices (Cintiq/Ipad)*/
 #if 0