[Bf-blender-cvs] [23831b2] master: Cleanup: style
Campbell Barton
noreply at git.blender.org
Tue Jul 21 09:34:19 CEST 2015
Commit: 23831b2161f807a35002fc0cab46eb4c8bbceac8
Author: Campbell Barton
Date: Tue Jul 21 12:01:03 2015 +1000
Branches: master
https://developer.blender.org/rB23831b2161f807a35002fc0cab46eb4c8bbceac8
Cleanup: style
===================================================================
M source/blender/blenkernel/intern/rigidbody.c
M source/blender/compositor/intern/COM_OpenCLDevice.cpp
M source/blender/editors/physics/particle_edit.c
M source/blender/makesrna/intern/rna_nodetree.c
===================================================================
diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index 882237d..476b9a2 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -274,10 +274,10 @@ static rbCollisionShape *rigidbody_get_shape_trimesh_from_mesh(Object *ob)
if (ob->type == OB_MESH) {
DerivedMesh *dm = NULL;
MVert *mvert;
- const MLoopTri *looptri = NULL;
+ const MLoopTri *looptri;
int totvert;
- int tottri = 0;
- const MLoop *mloop = NULL;
+ int tottri;
+ const MLoop *mloop;
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);
MVert *mvert;
const MLoopTri *looptri;
- int totvert, tottri = 0;
- const MLoop* mloop = NULL;
+ int totvert, tottri;
+ const MLoop *mloop;
/* ensure mesh validity, then grab data */
if (dm == NULL)
diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.cpp b/source/blender/compositor/intern/COM_OpenCLDevice.cpp
index 1b7acc9..1c9e59a 100644
--- a/source/blender/compositor/intern/COM_OpenCLDevice.cpp
+++ b/source/blender/compositor/intern/COM_OpenCLDevice.cpp
@@ -84,7 +84,7 @@ cl_mem OpenCLDevice::COM_clAttachMemoryBufferToKernelParameter(cl_kernel kernel,
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;
int num_channels = memoryBuffer->get_num_channels();
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index f256799..877c8ba 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -1685,10 +1685,10 @@ void PARTICLE_OT_select_random(wmOperatorType *ot)
/* properties */
RNA_def_float_percentage (ot->srna, "percent", 50.0f, 0.0f, 100.0f, "Percent",
- "Percentage (mean) of elements in randomly selected set",
- 0.0f, 100.0f);
+ "Percentage (mean) of elements in randomly selected set",
+ 0.0f, 100.0f);
ot->prop = RNA_def_enum (ot->srna, "type", select_random_type_items, RAN_HAIR,
- "Type", "Select either hair or points");
+ "Type", "Select either hair or points");
}
/************************ select linked operator ************************/
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 79c55c0..1524715 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -2974,7 +2974,7 @@ static PointerRNA rna_ShaderNodePointDensity_psys_get(PointerRNA *ptr)
{
bNode *node = ptr->data;
NodeShaderTexPointDensity *shader_point_density = node->storage;
- Object *ob = (Object*)node->id;
+ Object *ob = (Object *)node->id;
ParticleSystem *psys = NULL;
PointerRNA value;
@@ -2990,7 +2990,7 @@ static void rna_ShaderNodePointDensity_psys_set(PointerRNA *ptr, PointerRNA valu
{
bNode *node = ptr->data;
NodeShaderTexPointDensity *shader_point_density = node->storage;
- Object *ob = (Object*)node->id;
+ Object *ob = (Object *)node->id;
if (ob && value.id.data == ob) {
shader_point_density->particle_system = BLI_findindex(&ob->particlesystem, value.data) + 1;
More information about the Bf-blender-cvs
mailing list