[Bf-blender-cvs] [1dfbcd8] master: Fix a few compiler warnings with OS X / clang.
Brecht Van Lommel
noreply at git.blender.org
Sun Apr 17 01:16:12 CEST 2016
Commit: 1dfbcd88d5f64094062b0856539d894da0768478
Author: Brecht Van Lommel
Date: Sun Apr 17 00:51:29 2016 +0200
Branches: master
https://developer.blender.org/rB1dfbcd88d5f64094062b0856539d894da0768478
Fix a few compiler warnings with OS X / clang.
===================================================================
M intern/cycles/kernel/kernel_compat_cpu.h
M intern/moto/include/MT_Vector3.h
M intern/moto/include/MT_Vector4.h
M source/blender/editors/screen/screen_edit.c
===================================================================
diff --git a/intern/cycles/kernel/kernel_compat_cpu.h b/intern/cycles/kernel/kernel_compat_cpu.h
index df7d395..b96a844 100644
--- a/intern/cycles/kernel/kernel_compat_cpu.h
+++ b/intern/cycles/kernel/kernel_compat_cpu.h
@@ -154,6 +154,7 @@ template<typename T> struct texture_image {
break;
default:
kernel_assert(0);
+ return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
return read(data[ix + iy*width]);
}
@@ -183,6 +184,7 @@ template<typename T> struct texture_image {
break;
default:
kernel_assert(0);
+ return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
float4 r = (1.0f - ty)*(1.0f - tx)*read(data[ix + iy*width]);
@@ -231,6 +233,7 @@ template<typename T> struct texture_image {
break;
default:
kernel_assert(0);
+ return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
const int xc[4] = {pix, ix, nix, nnix};
@@ -298,6 +301,7 @@ template<typename T> struct texture_image {
break;
default:
kernel_assert(0);
+ return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
return read(data[ix + iy*width + iz*width*height]);
@@ -335,6 +339,7 @@ template<typename T> struct texture_image {
break;
default:
kernel_assert(0);
+ return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
float4 r;
@@ -402,6 +407,7 @@ template<typename T> struct texture_image {
break;
default:
kernel_assert(0);
+ return make_float4(0.0f, 0.0f, 0.0f, 0.0f);
}
const int xc[4] = {pix, ix, nix, nnix};
diff --git a/intern/moto/include/MT_Vector3.h b/intern/moto/include/MT_Vector3.h
index b06f345..545ca1f 100644
--- a/intern/moto/include/MT_Vector3.h
+++ b/intern/moto/include/MT_Vector3.h
@@ -52,7 +52,6 @@
class MT_Vector3 : public MT_Tuple3 {
public:
- virtual ~MT_Vector3() {}
MT_Vector3() {}
MT_Vector3(const float *v) : MT_Tuple3(v) {}
MT_Vector3(const double *v) : MT_Tuple3(v) {}
diff --git a/intern/moto/include/MT_Vector4.h b/intern/moto/include/MT_Vector4.h
index d157cef..440bf9b 100644
--- a/intern/moto/include/MT_Vector4.h
+++ b/intern/moto/include/MT_Vector4.h
@@ -53,7 +53,6 @@
class MT_Vector4 : public MT_Tuple4 {
public:
- virtual ~MT_Vector4() {}
MT_Vector4() {}
MT_Vector4(const float *v) : MT_Tuple4(v) {}
MT_Vector4(const double *v) : MT_Tuple4(v) {}
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index cb07ce7..21d257e 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1146,7 +1146,7 @@ void ED_screen_draw(wmWindow *win)
/* blended join arrow */
if (sa1 && sa2) {
int dir = area_getorientation(sa1, sa2);
- int dira;
+ int dira = -1;
if (dir != -1) {
switch (dir) {
case 0: /* W */
More information about the Bf-blender-cvs
mailing list