[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48127] trunk/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Wed Jun 20 18:43:49 CEST 2012
Revision: 48127
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48127
Author: campbellbarton
Date: 2012-06-20 16:43:48 +0000 (Wed, 20 Jun 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
trunk/blender/intern/bsp/test/BSP_GhostTest/main.cpp
trunk/blender/intern/raskter/raskter.c
trunk/blender/source/blender/blenkernel/intern/boids.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/collada/MaterialExporter.cpp
trunk/blender/source/blender/collada/SkinInfo.cpp
trunk/blender/source/blender/collada/TransformReader.cpp
trunk/blender/source/blender/collada/collada_internal.cpp
trunk/blender/source/blender/collada/collada_utils.cpp
trunk/blender/source/blender/compositor/intern/COM_NodeOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/imbuf/intern/jp2.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/gameengine/GameLogic/SCA_PythonController.cpp
Modified: trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
===================================================================
--- trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp 2012-06-20 16:34:15 UTC (rev 48126)
+++ trunk/blender/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp 2012-06-20 16:43:48 UTC (rev 48127)
@@ -205,16 +205,16 @@
void
BSP_GhostTestApp3D::
UpdateFrame(
-){
-if (m_window) {
+) {
+ if (m_window) {
- GHOST_Rect v_rect;
- m_window->getClientBounds(v_rect);
+ GHOST_Rect v_rect;
+ m_window->getClientBounds(v_rect);
- glViewport(0,0,v_rect.getWidth(),v_rect.getHeight());
+ glViewport(0,0,v_rect.getWidth(),v_rect.getHeight());
+ }
}
-}
MT_Vector3
Modified: trunk/blender/intern/bsp/test/BSP_GhostTest/main.cpp
===================================================================
--- trunk/blender/intern/bsp/test/BSP_GhostTest/main.cpp 2012-06-20 16:34:15 UTC (rev 48126)
+++ trunk/blender/intern/bsp/test/BSP_GhostTest/main.cpp 2012-06-20 16:43:48 UTC (rev 48127)
@@ -93,8 +93,8 @@
#endif
-int main() {
-
+int main()
+{
MT_Vector3 min,max;
MT_Vector3 min2,max2;
Modified: trunk/blender/intern/raskter/raskter.c
===================================================================
--- trunk/blender/intern/raskter/raskter.c 2012-06-20 16:34:15 UTC (rev 48126)
+++ trunk/blender/intern/raskter/raskter.c 2012-06-20 16:43:48 UTC (rev 48127)
@@ -67,7 +67,8 @@
* just the poly. Since the DEM code could end up being coupled with this, we'll keep it separate
* for now.
*/
-static void preprocess_all_edges(struct r_fill_context *ctx, struct poly_vert *verts, int num_verts, struct e_status *open_edge) {
+static void preprocess_all_edges(struct r_fill_context *ctx, struct poly_vert *verts, int num_verts, struct e_status *open_edge)
+{
int i;
int xbeg;
int ybeg;
@@ -165,7 +166,8 @@
* for speed, but waiting on final design choices for curve-data before eliminating data the DEM code will need
* if it ends up being coupled with this function.
*/
-static int rast_scan_fill(struct r_fill_context *ctx, struct poly_vert *verts, int num_verts, float intensity) {
+static int rast_scan_fill(struct r_fill_context *ctx, struct poly_vert *verts, int num_verts, float intensity)
+{
int x_curr; /* current pixel position in X */
int y_curr; /* current scan line being drawn */
int yp; /* y-pixel's position in frame buffer */
@@ -757,18 +759,21 @@
return i; /* Return the value returned by the rasterizer. */
}
-int get_range_expanded_pixel_coord(float normalized_value, int max_value) {
+int get_range_expanded_pixel_coord(float normalized_value, int max_value)
+{
return (int)((normalized_value * (float)(max_value)) + 0.5f);
}
-float get_pixel_intensity(float *buf, int buf_x, int buf_y, int pos_x, int pos_y) {
+float get_pixel_intensity(float *buf, int buf_x, int buf_y, int pos_x, int pos_y)
+{
if(pos_x < 0 || pos_x >= buf_x || pos_y < 0 || pos_y >= buf_y) {
return 0.0f;
}
return buf[(pos_y * buf_y) + buf_x];
}
-float get_pixel_intensity_bilinear(float *buf, int buf_x, int buf_y, float u, float v) {
+float get_pixel_intensity_bilinear(float *buf, int buf_x, int buf_y, float u, float v)
+{
int a;
int b;
int a_plus_1;
@@ -794,14 +799,16 @@
}
-void set_pixel_intensity(float *buf, int buf_x, int buf_y, int pos_x, int pos_y, float intensity) {
+void set_pixel_intensity(float *buf, int buf_x, int buf_y, int pos_x, int pos_y, float intensity)
+{
if(pos_x < 0 || pos_x >= buf_x || pos_y < 0 || pos_y >= buf_y) {
return;
}
buf[(pos_y * buf_y) + buf_x] = intensity;
}
#define __PLX__FAKE_AA__
-int PLX_antialias_buffer(float *buf, int buf_x, int buf_y) {
+int PLX_antialias_buffer(float *buf, int buf_x, int buf_y)
+{
#ifdef __PLX__FAKE_AA__
#ifdef __PLX_GREY_AA__
int i=0;
Modified: trunk/blender/source/blender/blenkernel/intern/boids.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/boids.c 2012-06-20 16:34:15 UTC (rev 48126)
+++ trunk/blender/source/blender/blenkernel/intern/boids.c 2012-06-20 16:43:48 UTC (rev 48127)
@@ -920,7 +920,8 @@
return state;
}
-//static int boid_condition_is_true(BoidCondition *cond) {
+//static int boid_condition_is_true(BoidCondition *cond)
+//{
// /* TODO */
// return 0;
//}
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2012-06-20 16:34:15 UTC (rev 48126)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2012-06-20 16:43:48 UTC (rev 48127)
@@ -3101,7 +3101,8 @@
return ob_arm;
}
-static int obrel_is_recursive_child(Object *ob, Object *child) {
+static int obrel_is_recursive_child(Object *ob, Object *child)
+{
Object *par;
for (par = child->parent; par; par = par->parent) {
if (par == ob) {
Modified: trunk/blender/source/blender/collada/MaterialExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/MaterialExporter.cpp 2012-06-20 16:34:15 UTC (rev 48126)
+++ trunk/blender/source/blender/collada/MaterialExporter.cpp 2012-06-20 16:43:48 UTC (rev 48127)
@@ -31,7 +31,9 @@
#include "COLLADABUUtils.h"
#include "collada_internal.h"
-MaterialsExporter::MaterialsExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryMaterials(sw), export_settings(export_settings) {
+MaterialsExporter::MaterialsExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryMaterials(sw), export_settings(export_settings)
+{
+ /* pass */
}
void MaterialsExporter::exportMaterials(Scene *sce)
Modified: trunk/blender/source/blender/collada/SkinInfo.cpp
===================================================================
--- trunk/blender/source/blender/collada/SkinInfo.cpp 2012-06-20 16:34:15 UTC (rev 48126)
+++ trunk/blender/source/blender/collada/SkinInfo.cpp 2012-06-20 16:43:48 UTC (rev 48127)
@@ -57,7 +57,9 @@
// This is used to store data passed in write_controller_data.
// Arrays from COLLADAFW::SkinControllerData lose ownership, so do this class members
// so that arrays don't get freed until we free them explicitly.
-SkinInfo::SkinInfo() {
+SkinInfo::SkinInfo()
+{
+ /* pass */
}
SkinInfo::SkinInfo(const SkinInfo& skin) : weights(skin.weights),
Modified: trunk/blender/source/blender/collada/TransformReader.cpp
===================================================================
--- trunk/blender/source/blender/collada/TransformReader.cpp 2012-06-20 16:34:15 UTC (rev 48126)
+++ trunk/blender/source/blender/collada/TransformReader.cpp 2012-06-20 16:43:48 UTC (rev 48127)
@@ -29,7 +29,9 @@
#include "TransformReader.h"
-TransformReader::TransformReader(UnitConverter *conv) : unit_converter(conv) {
+TransformReader::TransformReader(UnitConverter *conv) : unit_converter(conv)
+{
+ /* pass */
}
void TransformReader::get_node_mat(float mat[][4], COLLADAFW::Node *node, std::map<COLLADAFW::UniqueId, Animation> *animation_map, Object *ob)
Modified: trunk/blender/source/blender/collada/collada_internal.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada_internal.cpp 2012-06-20 16:34:15 UTC (rev 48126)
+++ trunk/blender/source/blender/collada/collada_internal.cpp 2012-06-20 16:43:48 UTC (rev 48127)
@@ -31,7 +31,9 @@
#include "BLI_linklist.h"
-UnitConverter::UnitConverter() : unit(), up_axis(COLLADAFW::FileInfo::Z_UP) {
+UnitConverter::UnitConverter() : unit(), up_axis(COLLADAFW::FileInfo::Z_UP)
+{
+ /* pass */
}
void UnitConverter::read_asset(const COLLADAFW::FileInfo *asset)
Modified: trunk/blender/source/blender/collada/collada_utils.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada_utils.cpp 2012-06-20 16:34:15 UTC (rev 48126)
+++ trunk/blender/source/blender/collada/collada_utils.cpp 2012-06-20 16:43:48 UTC (rev 48127)
@@ -260,7 +260,8 @@
* can be root bones. Otherwise the top most deform bones in the hierarchy
* are root bones.
*/
-bool bc_is_root_bone(Bone *aBone, bool deform_bones_only) {
+bool bc_is_root_bone(Bone *aBone, bool deform_bones_only)
+{
if (deform_bones_only) {
Bone *root = NULL;
Bone *bone = aBone;
Modified: trunk/blender/source/blender/compositor/intern/COM_NodeOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_NodeOperation.cpp 2012-06-20 16:34:15 UTC (rev 48126)
+++ trunk/blender/source/blender/compositor/intern/COM_NodeOperation.cpp 2012-06-20 16:43:48 UTC (rev 48127)
@@ -194,7 +194,8 @@
if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); }
}
-void NodeOperation::COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, MemoryBuffer *outputMemoryBuffer) {
+void NodeOperation::COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, MemoryBuffer *outputMemoryBuffer)
+{
cl_int error;
const size_t size[] = {outputMemoryBuffer->getWidth(), outputMemoryBuffer->getHeight()};
@@ -202,7 +203,8 @@
if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); }
}
-void NodeOperation::COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, MemoryBuffer *outputMemoryBuffer, int offsetIndex) {
+void NodeOperation::COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel, MemoryBuffer *outputMemoryBuffer, int offsetIndex)
+{
cl_int error;
const int width = outputMemoryBuffer->getWidth();
const int height = outputMemoryBuffer->getHeight();
Modified: trunk/blender/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_WriteBufferOperation.cpp 2012-06-20 16:34:15 UTC (rev 48126)
+++ trunk/blender/source/blender/compositor/operations/COM_WriteBufferOperation.cpp 2012-06-20 16:43:48 UTC (rev 48127)
@@ -175,7 +175,8 @@
delete clKernelsToCleanUp;
}
-void WriteBufferOperation::readResolutionFromInputSocket() {
+void WriteBufferOperation::readResolutionFromInputSocket()
+{
NodeOperation *inputOperation = this->getInputOperation(0);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list