[Bf-blender-cvs] [62edc31d343] blender2.8: Cleanup: correct function signatures

Campbell Barton noreply at git.blender.org
Wed Nov 28 06:23:01 CET 2018


Commit: 62edc31d3433a9fded71e92d4168bcbf61c5b4bd
Author: Campbell Barton
Date:   Wed Nov 28 16:21:24 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB62edc31d3433a9fded71e92d4168bcbf61c5b4bd

Cleanup: correct function signatures

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

M	source/blender/blenlib/BLI_math_color.h
M	source/blender/gpu/GPU_immediate.h
M	source/blender/modifiers/intern/MOD_meshsequencecache.c

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

diff --git a/source/blender/blenlib/BLI_math_color.h b/source/blender/blenlib/BLI_math_color.h
index 72d29164988..3653191232c 100644
--- a/source/blender/blenlib/BLI_math_color.h
+++ b/source/blender/blenlib/BLI_math_color.h
@@ -112,7 +112,7 @@ void BLI_init_srgb_conversion(void);
 
 MINLINE void premul_to_straight_v4_v4(float straight[4], const float premul[4]);
 MINLINE void premul_to_straight_v4(float color[4]);
-MINLINE void straight_to_premul_v4_v4(float straight[4], const float premul[4]);
+MINLINE void straight_to_premul_v4_v4(float premul[4], const float straight[4]);
 MINLINE void straight_to_premul_v4(float color[4]);
 MINLINE void straight_uchar_to_premul_float(float result[4], const unsigned char color[4]);
 MINLINE void premul_float_to_straight_uchar(unsigned char *result, const float color[4]);
diff --git a/source/blender/gpu/GPU_immediate.h b/source/blender/gpu/GPU_immediate.h
index 846adc44cee..a57ce674b77 100644
--- a/source/blender/gpu/GPU_immediate.h
+++ b/source/blender/gpu/GPU_immediate.h
@@ -76,7 +76,7 @@ void immAttr4fv(uint attr_id, const float data[4]);
 void immAttr3ub(uint attr_id, unsigned char r, unsigned char g, unsigned char b);
 void immAttr4ub(uint attr_id, unsigned char r, unsigned char g, unsigned char b, unsigned char a);
 
-void immAttr3ubv(uint attr_id, const unsigned char data[4]);
+void immAttr3ubv(uint attr_id, const unsigned char data[3]);
 void immAttr4ubv(uint attr_id, const unsigned char data[4]);
 
 /* Explicitly skip an attribute. */
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c
index 6db78731683..771ccd31e22 100644
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.c
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c
@@ -151,8 +151,8 @@ static Mesh *applyModifier(
 
 	return result ? result : mesh;
 #else
-	return mesh;
 	UNUSED_VARS(ctx, md);
+	return mesh;
 #endif
 }



More information about the Bf-blender-cvs mailing list