[Bf-blender-cvs] [73ffcb0] GPencil_Editing_Stage3: GPencil Sculpt: Fix compilation errors in previous commit

Joshua Leung noreply at git.blender.org
Sun Aug 16 16:25:21 CEST 2015


Commit: 73ffcb0754c210e9d476bbcaa0cd395761e0afe1
Author: Joshua Leung
Date:   Sun Aug 16 22:52:16 2015 +1200
Branches: GPencil_Editing_Stage3
https://developer.blender.org/rB73ffcb0754c210e9d476bbcaa0cd395761e0afe1

GPencil Sculpt: Fix compilation errors in previous commit

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

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 79cf61b..b16b4e2 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -105,7 +105,7 @@ void gp_point_to_xy(GP_SpaceConversion *settings, struct bGPDstroke *gps, struct
  * \param screeN_co    The screenspace 2D coordinates to convert to 
  * \param[out] r_out  The resulting 3D coordinates of the input point
  */
-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(GP_SpaceConversion *gsc, struct Scene *scene, const float screen_co[2], float r_out[3]);
 
 /* Poll Callbacks ------------------------------------ */
 /* gpencil_utils.c */
diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index dbbc3d0..735bc3f 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -380,8 +380,8 @@ void gp_point_to_xy(GP_SpaceConversion *gsc, bGPDstroke *gps, bGPDspoint *pt,
  */
 bool gp_point_xy_to_3d(GP_SpaceConversion *gsc, Scene *scene, const float screen_co[2], float r_out[3])
 {
-	View3D *v3d = gso->sa->spacedata.first;
-	RegionView3D *rv3d = gso->ar->regiondata;
+	View3D *v3d = gsc->sa->spacedata.first;
+	RegionView3D *rv3d = gsc->ar->regiondata;
 	float *rvec = ED_view3d_cursor3d_get(scene, v3d);
 	float zfac = ED_view3d_calc_zfac(rv3d, rvec, NULL);
 	
@@ -392,7 +392,7 @@ bool gp_point_xy_to_3d(GP_SpaceConversion *gsc, Scene *scene, const float screen
 	
 	if (ED_view3d_project_float_global(gsc->ar, rvec, mval_prj, V3D_PROJ_TEST_NOP) == V3D_PROJ_RET_OK) {
 		sub_v2_v2v2(mval_f, mval_prj, mval_f);
-		ED_view3d_win_to_delta(gso->ar, mval_f, dvec, zfac);
+		ED_view3d_win_to_delta(gsc->ar, mval_f, dvec, zfac);
 		sub_v3_v3v3(r_out, rvec, dvec);
 		
 		return true;




More information about the Bf-blender-cvs mailing list