[Bf-blender-cvs] [c6e7e32] gooseberry: Fix compilation errors

Antony Riakiotakis noreply at git.blender.org
Thu Jul 2 16:40:33 CEST 2015


Commit: c6e7e328c78e2743e6f86f403414be0d88586d55
Author: Antony Riakiotakis
Date:   Thu Jul 2 16:40:01 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBc6e7e328c78e2743e6f86f403414be0d88586d55

Fix compilation errors

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

M	source/blender/editors/transform/transform.c
M	source/blender/editors/transform/transform_snap.c
M	source/blender/pointcache/util/util_error_handler.h

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

diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index c43b9bf..3a737cc 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -2095,11 +2095,6 @@ bool initTransform(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 	else
 		unit_m3(t->spacemtx);
 
-	/* initialize snapping factors */
-	t->snap_aspect[0] = t->snap_aspect[1] = t->snap_aspect[2] = 1.0f;
-
-	initSnappingAspect(t);
-	
 	createTransData(C, t);          // make TransData structs from selection
 
 	if (t->total == 0) {
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index d548074..2bf4baa 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -2445,7 +2445,7 @@ static void applyGridIncrement(TransInfo *t, float *val, int max_index, const fl
 	BLI_assert(max_index <= 2);
 
 	/* Early bailing out if no need to snap */
-	if (fac[action] == 0.0f) {
+	if (fac[action] == 0.0f)
 		return;
 
 	if (use_aspect) {
diff --git a/source/blender/pointcache/util/util_error_handler.h b/source/blender/pointcache/util/util_error_handler.h
index 61baa03..d706890 100644
--- a/source/blender/pointcache/util/util_error_handler.h
+++ b/source/blender/pointcache/util/util_error_handler.h
@@ -108,7 +108,7 @@ private:
 BLI_INLINE void split_alembic_error_message(const char *msg, const char **origin, const char **base_msg)
 {
 	const char delim[] = {'\n', '\0'};
-	char *sep, *suffix;
+	const char *sep, *suffix;
 	
 	BLI_str_partition(msg, delim, &sep, &suffix);
 	if (suffix) {




More information about the Bf-blender-cvs mailing list