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

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton 2015-07-21 12:01:03 +10:00
parent ae00011956
commit 23831b2161
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/rigidbody.c
View File

@ -274,10 +274,10 @@ static rbCollisionShape *rigidbody_get_shape_trimesh_from_mesh(Object *ob)
if (ob->type == OB_MESH) { if (ob->type == OB_MESH) {
DerivedMesh *dm = NULL; DerivedMesh *dm = NULL;
MVert *mvert; MVert *mvert;
const MLoopTri *looptri = NULL; const MLoopTri *looptri;
int totvert; int totvert;
int tottri = 0; int tottri;
const MLoop *mloop = NULL; const MLoop *mloop;
dm = rigidbody_get_mesh(ob); dm = rigidbody_get_mesh(ob);
@ -596,8 +596,8 @@ void BKE_rigidbody_calc_center_of_mass(Object *ob, float r_center[3])
DerivedMesh *dm = rigidbody_get_mesh(ob); DerivedMesh *dm = rigidbody_get_mesh(ob);
MVert *mvert; MVert *mvert;
const MLoopTri *looptri; const MLoopTri *looptri;
int totvert, tottri = 0; int totvert, tottri;
const MLoop* mloop = NULL; const MLoop *mloop;
/* ensure mesh validity, then grab data */ /* ensure mesh validity, then grab data */
if (dm == NULL) if (dm == NULL)

2
source/blender/compositor/intern/COM_OpenCLDevice.cpp
View File

@ -84,7 +84,7 @@ cl_mem OpenCLDevice::COM_clAttachMemoryBufferToKernelParameter(cl_kernel kernel,
return COM_clAttachMemoryBufferToKernelParameter(kernel, parameterIndex, offsetIndex, cleanup, inputMemoryBuffers, (ReadBufferOperation *)reader); return COM_clAttachMemoryBufferToKernelParameter(kernel, parameterIndex, offsetIndex, cleanup, inputMemoryBuffers, (ReadBufferOperation *)reader);
} }
const cl_image_format* OpenCLDevice::determineImageFormat(MemoryBuffer *memoryBuffer) const cl_image_format *OpenCLDevice::determineImageFormat(MemoryBuffer *memoryBuffer)
{ {
const cl_image_format *imageFormat; const cl_image_format *imageFormat;
int num_channels = memoryBuffer->get_num_channels(); int num_channels = memoryBuffer->get_num_channels();

4
source/blender/makesrna/intern/rna_nodetree.c
View File

@ -2974,7 +2974,7 @@ static PointerRNA rna_ShaderNodePointDensity_psys_get(PointerRNA *ptr)
{ {
bNode *node = ptr->data; bNode *node = ptr->data;
NodeShaderTexPointDensity *shader_point_density = node->storage; NodeShaderTexPointDensity *shader_point_density = node->storage;
Object *ob = (Object*)node->id; Object *ob = (Object *)node->id;
ParticleSystem *psys = NULL; ParticleSystem *psys = NULL;
PointerRNA value; PointerRNA value;
@ -2990,7 +2990,7 @@ static void rna_ShaderNodePointDensity_psys_set(PointerRNA *ptr, PointerRNA valu
{ {
bNode *node = ptr->data; bNode *node = ptr->data;
NodeShaderTexPointDensity *shader_point_density = node->storage; NodeShaderTexPointDensity *shader_point_density = node->storage;
Object *ob = (Object*)node->id; Object *ob = (Object *)node->id;
if (ob && value.id.data == ob) { if (ob && value.id.data == ob) {
shader_point_density->particle_system = BLI_findindex(&ob->particlesystem, value.data) + 1; shader_point_density->particle_system = BLI_findindex(&ob->particlesystem, value.data) + 1;