archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Code cleanup: white space and cmake was broken on all platforms

Browse Source
This commit is contained in:
Campbell Barton
2014-02-03 13:55:26 +11:00
parent 236e468359
commit 1dc1d92dab
16 changed files with 81 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
intern/cycles/util/util_transform.h
View File

@@ -275,7 +275,8 @@ ccl_device_inline bool transform_uniform_scale(const Transform& tfm, float& scal
if(fabsf(sx - sy) < eps && fabsf(sx - sz) < eps &&
fabsf(sx - stx) < eps && fabsf(sx - sty) < eps &&
fabsf(sx - stz) < eps) {
fabsf(sx - stz) < eps)
{
scale = sx;
return true;
}

14
intern/iksolver/test/ik_glut_test/intern/main.cpp
View File

@@ -41,10 +41,8 @@
#include "MyGlutKeyHandler.h"
#include "ChainDrawer.h"
void
init(MT_Vector3 min,MT_Vector3 max)
void init(MT_Vector3 min,MT_Vector3 max)
{
GLfloat light_diffuse0[] = {1.0, 0.0, 0.0, 1.0}; /* Red diffuse light. */
GLfloat light_position0[] = {1.0, 1.0, 1.0, 0.0}; /* Infinite light location. */
@@ -76,8 +74,7 @@ init(MT_Vector3 min,MT_Vector3 max)
float depth = diag.length();
float distance = 2;
gluPerspective(
/* field of view in degree */ 40.0,
gluPerspective(/* field of view in degree */ 40.0,
/* aspect ratio */ 1.0,
/* Z near */ 1.0,
/* Z far */ distance * depth * 2
@@ -85,8 +82,7 @@ init(MT_Vector3 min,MT_Vector3 max)
glMatrixMode(GL_MODELVIEW);
gluLookAt(
center.x(), center.y(), center.z() + distance*depth, /* eye is at (0,0,5) */
gluLookAt(center.x(), center.y(), center.z() + distance*depth, /* eye is at (0,0,5) */
center.x(), center.y(), center.z(), /* center is at (0,0,0) */
0.0, 1.0, 0.); /* up is in positive Y direction */
@@ -94,8 +90,8 @@ init(MT_Vector3 min,MT_Vector3 max)
}
int
main(int argc, char **argv)
int main(int argc, char **argv)
{

2
source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp
View File

@@ -65,7 +65,7 @@ static char UnaryFunction0DUnsigned___doc__[] =
"\n"
".. method:: __init__()\n"
"\n"
" Default constructor.\n";
" Default constructor.\n";
static int UnaryFunction0DUnsigned___init__(BPy_UnaryFunction0DUnsigned *self, PyObject *args, PyObject *kwds)
{

1
source/tests/CMakeLists.txt
View File

@@ -39,6 +39,7 @@ if(APPLE)
set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/$(CONFIGURATION)/blender.app/Contents/MacOS/blender)
else()
set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_BUILD_TYPE}/blender.app/Contents/MacOS/blender)
endif()
else()
set(TEST_BLENDER_EXE ${EXECUTABLE_OUTPUT_PATH}/blender)
endif()