[Bf-blender-cvs] [833268e] GPencil_Editing_Stage3: Compile fix for changes from master

Joshua Leung noreply at git.blender.org
Sat Dec 12 15:24:05 CET 2015


Commit: 833268e2b8ef9c944f913b4f5ba0b4084423d6f2
Author: Joshua Leung
Date:   Sat Dec 12 17:52:52 2015 +1300
Branches: GPencil_Editing_Stage3
https://developer.blender.org/rB833268e2b8ef9c944f913b4f5ba0b4084423d6f2

Compile fix for changes from master

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

M	source/blender/editors/gpencil/gpencil_edit.c
M	source/blender/editors/transform/transform_manipulator.c

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

diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c
index d6eae15..5068eda 100644
--- a/source/blender/editors/gpencil/gpencil_edit.c
+++ b/source/blender/editors/gpencil/gpencil_edit.c
@@ -1117,7 +1117,7 @@ static int gp_snap_cursor_to_sel(bContext *C, wmOperator *op)
 	}
 	CTX_DATA_END;
 	
-	if (v3d->around == V3D_CENTROID) {
+	if (v3d->around == V3D_AROUND_CENTER_MEAN) {
 		mul_v3_fl(centroid, 1.0f / (float)count);
 		copy_v3_v3(cursor, centroid);
 	}
diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index 0c3f74d..74d27fb 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -1623,6 +1623,9 @@ void BIF_draw_manipulator(const bContext *C)
 			case V3D_AROUND_CENTER_BOUNDS:
 			case V3D_AROUND_ACTIVE:
 			{
+				bGPdata *gpd = CTX_data_gpencil_data(C);
+ 				Object *ob = OBACT;
+				
 				if (((v3d->around == V3D_AROUND_ACTIVE) && (scene->obedit == NULL)) &&
 				    ((gpd == NULL) || !(gpd->flag & GP_DATA_STROKE_EDITMODE)) &&
 				    (!(ob->mode & OB_MODE_POSE)))




More information about the Bf-blender-cvs mailing list