[Bf-blender-cvs] [c26a9ee] master: Error in last commit

Campbell Barton noreply at git.blender.org
Tue Sep 8 18:45:27 CEST 2015


Commit: c26a9eed929f3a06bc2721eafd5c716b9d8fe0be
Author: Campbell Barton
Date:   Wed Sep 9 02:39:40 2015 +1000
Branches: master
https://developer.blender.org/rBc26a9eed929f3a06bc2721eafd5c716b9d8fe0be

Error in last commit

Had warnings disabled.

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

M	source/blender/editors/transform/transform_orientations.c

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

diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c
index c91666b..a1bb6f4 100644
--- a/source/blender/editors/transform/transform_orientations.c
+++ b/source/blender/editors/transform/transform_orientations.c
@@ -394,7 +394,7 @@ int BIF_countTransformOrientation(const bContext *C)
 bool applyTransformOrientation(const bContext *C, float mat[3][3], char *r_name, int index)
 {
 	ListBase *transform_spaces = &CTX_data_scene(C)->transform_spaces;
-	const TransformOrientation *ts = BLI_findlink(transform_spaces, index);
+	TransformOrientation *ts = BLI_findlink(transform_spaces, index);
 
 	BLI_assert(index >= 0);
 
@@ -1047,7 +1047,7 @@ int getTransformOrientation(const bContext *C, float normal[3], float plane[3])
 	/* dummy value, not V3D_ACTIVE and not V3D_LOCAL */
 	short around = V3D_CENTER;
 
-	getTransformOrientation_ex(C, normal, plane, around);
+	return getTransformOrientation_ex(C, normal, plane, around);
 }
 
 void ED_getTransformOrientationMatrix(const bContext *C, float orientation_mat[3][3], const short around)




More information about the Bf-blender-cvs mailing list