[Bf-blender-cvs] [6a39d725584] master: Cleanup: declare vars or make static

Campbell Barton noreply at git.blender.org
Wed Aug 1 00:57:41 CEST 2018


Commit: 6a39d7255848511f231085bfb70c7daea8f0ca59
Author: Campbell Barton
Date:   Wed Aug 1 08:57:31 2018 +1000
Branches: master
https://developer.blender.org/rB6a39d7255848511f231085bfb70c7daea8f0ca59

Cleanup: declare vars or make static

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

M	source/blender/makesrna/intern/rna_rigidbody.c
M	source/blender/python/generic/imbuf_py_api.h
M	source/blender/python/intern/bpy_driver.c

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

diff --git a/source/blender/makesrna/intern/rna_rigidbody.c b/source/blender/makesrna/intern/rna_rigidbody.c
index 853b1d9978c..5b86ec6b10d 100644
--- a/source/blender/makesrna/intern/rna_rigidbody.c
+++ b/source/blender/makesrna/intern/rna_rigidbody.c
@@ -77,7 +77,7 @@ const EnumPropertyItem rna_enum_rigidbody_constraint_type_items[] = {
 	{0, NULL, 0, NULL, NULL}};
 
 /* bullet spring type */
-const EnumPropertyItem rna_enum_rigidbody_constraint_spring_type_items[] = {
+static const EnumPropertyItem rna_enum_rigidbody_constraint_spring_type_items[] = {
 	{RBC_SPRING_TYPE1, "SPRING1", ICON_NONE, "Blender 2.7", "Spring implementation used in blender 2.7. Damping is capped at 1.0"},
 	{RBC_SPRING_TYPE2, "SPRING2", ICON_NONE, "Blender 2.8", "New implementation available since 2.8"},
 	{0, NULL, 0, NULL, NULL}};
diff --git a/source/blender/python/generic/imbuf_py_api.h b/source/blender/python/generic/imbuf_py_api.h
index 92c1732a9c9..35adc541bfc 100644
--- a/source/blender/python/generic/imbuf_py_api.h
+++ b/source/blender/python/generic/imbuf_py_api.h
@@ -27,4 +27,6 @@
 
 PyObject *BPyInit_imbuf(void);
 
+extern PyTypeObject Py_ImBuf_Type;
+
 #endif  /* __IMBUF_PY_API_H__ */
diff --git a/source/blender/python/intern/bpy_driver.c b/source/blender/python/intern/bpy_driver.c
index f6ff1b3f36b..e7608e93f58 100644
--- a/source/blender/python/intern/bpy_driver.c
+++ b/source/blender/python/intern/bpy_driver.c
@@ -252,7 +252,7 @@ static void pydriver_error(ChannelDriver *driver)
 
 #define OK_OP(op) [op] = 1
 
-const char secure_opcodes[255] = {
+static const char secure_opcodes[255] = {
 	OK_OP(POP_TOP),
 	OK_OP(ROT_TWO),
 	OK_OP(ROT_THREE),



More information about the Bf-blender-cvs mailing list