sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup: remove unused var for windows and style edit (remove spaces between 'var[num]')

Browse Source
This commit is contained in:
Campbell Barton 2012-04-12 00:15:02 +00:00
parent c8b19b7b7f
commit 5aaf3ede76
6 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenlib/intern/BLI_kdopbvh.c
View File

@ -599,13 +599,13 @@ static void verify_tree(BVHTree *tree)
//This code can be easily reduced (basicly this is only method to calculate pow(k, n) in O(1).. and stuff like that)
typedef struct BVHBuildHelper
{
int tree_type; //
int totleafs; //
int tree_type; /* */
int totleafs; /* */
int leafs_per_child [32]; //Min number of leafs that are archievable from a node at depth N
int branches_on_level[32]; //Number of nodes at depth N (tree_type^N)
int leafs_per_child[32]; /* Min number of leafs that are archievable from a node at depth N */
int branches_on_level[32]; /* Number of nodes at depth N (tree_type^N) */
int remain_leafs; //Number of leafs that are placed on the level that is not 100% filled
int remain_leafs; /* Number of leafs that are placed on the level that is not 100% filled */
} BVHBuildHelper;

17
source/blender/blenlib/intern/fileops.c
View File

@ -212,13 +212,11 @@ FILE *BLI_fopen(const char *filename, const char *mode)
gzFile BLI_gzopen(const char *filename, const char *mode)
{
gzFile gzfile;
int fi;
if (!filename || !mode) {return 0;}
else
{
if (!filename || !mode) {
return 0;
}
else {
wchar_t short_name_16[256];
char short_name[256];
int i = 0;
@ -231,14 +229,15 @@ gzFile BLI_gzopen(const char *filename, const char *mode)
GetShortPathNameW(filename_16,short_name_16, 256);
for (i=0;i<256;i++) {short_name[i]=short_name_16[i];};
for (i = 0; i < 256; i++) {
short_name[i] = short_name_16[i];
}
gzfile = gzopen(short_name,mode);
UTF16_UN_ENCODE(filename);
}
return gzfile;
}

4
source/gameengine/Converter/BL_ArmatureChannel.cpp
View File

@ -307,7 +307,7 @@ int BL_ArmatureChannel::py_attr_set_joint_rotation(void *self_v, const struct KX
float quat[4];
if (!PySequence_Check(value) || PySequence_Size(value) != 3) {
PyErr_SetString(PyExc_AttributeError, "expected a sequence of [3] floats");
PyErr_SetString(PyExc_AttributeError, "expected a sequence of 3 floats");
return PY_SET_ATTR_FAIL;
}
for (int i=0; i<3; i++) {
@ -315,7 +315,7 @@ int BL_ArmatureChannel::py_attr_set_joint_rotation(void *self_v, const struct KX
joints[i] = PyFloat_AsDouble(item);
Py_DECREF(item);
if (joints[i] == -1.0f && PyErr_Occurred()) {
PyErr_SetString(PyExc_AttributeError, "expected a sequence of [3] floats");
PyErr_SetString(PyExc_AttributeError, "expected a sequence of 3 floats");
return PY_SET_ATTR_FAIL;
}
}