[Bf-blender-cvs] [3331c735641] greasepencil-object: GP: Cleanup compiler warnings
Antonioya
noreply at git.blender.org
Mon Jan 7 16:12:46 CET 2019
Commit: 3331c7356418d7b3c8eac24aa74ec72672ef38d2
Author: Antonioya
Date: Mon Jan 7 16:08:30 2019 +0100
Branches: greasepencil-object
https://developer.blender.org/rB3331c7356418d7b3c8eac24aa74ec72672ef38d2
GP: Cleanup compiler warnings
===================================================================
M source/blender/editors/gpencil/gpencil_intern.h
M source/blender/editors/gpencil/gpencil_utils.c
===================================================================
diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index e583e3d1f48..56ddf81f357 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -234,9 +234,9 @@ void gp_apply_parent(struct Depsgraph *depsgraph, struct Object *obact, bGPdata
*/
void gp_apply_parent_point(struct Depsgraph *depsgraph, struct Object *obact, bGPdata *gpd, bGPDlayer *gpl, bGPDspoint *pt);
-void gp_point_3d_to_xy(GP_SpaceConversion *gsc, const short flag, const float pt[3], float xy[2]);
+void gp_point_3d_to_xy(const GP_SpaceConversion *gsc, const short flag, const float pt[3], float xy[2]);
-bool gp_point_xy_to_3d(GP_SpaceConversion *gsc, struct Scene *scene, const float screen_co[2], float r_out[3]);
+bool gp_point_xy_to_3d(const GP_SpaceConversion *gsc, struct Scene *scene, const float screen_co[2], float r_out[3]);
/* helper to convert 2d to 3d */
void gp_stroke_convertcoords_tpoint(
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index 6aa77d80687..62fa65e6307 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -795,7 +795,7 @@ void gp_point_3d_to_xy(const GP_SpaceConversion *gsc, const short flag, const fl
*
* \warning Assumes that it is getting called in a 3D view only.
*/
-bool gp_point_xy_to_3d(GP_SpaceConversion *gsc, Scene *scene, const float screen_co[2], float r_out[3])
+bool gp_point_xy_to_3d(const GP_SpaceConversion *gsc, Scene *scene, const float screen_co[2], float r_out[3])
{
const RegionView3D *rv3d = gsc->ar->regiondata;
float rvec[3];
More information about the Bf-blender-cvs
mailing list