Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp12
-rw-r--r--intern/bsp/test/BSP_GhostTest/main.cpp4
-rw-r--r--intern/raskter/raskter.c21
-rw-r--r--source/blender/blenkernel/intern/boids.c3
-rw-r--r--source/blender/blenkernel/intern/object.c3
-rw-r--r--source/blender/collada/MaterialExporter.cpp4
-rw-r--r--source/blender/collada/SkinInfo.cpp4
-rw-r--r--source/blender/collada/TransformReader.cpp4
-rw-r--r--source/blender/collada/collada_internal.cpp4
-rw-r--r--source/blender/collada/collada_utils.cpp3
-rw-r--r--source/blender/compositor/intern/COM_NodeOperation.cpp6
-rw-r--r--source/blender/compositor/operations/COM_WriteBufferOperation.cpp3
-rw-r--r--source/blender/editors/space_file/file_ops.c3
-rw-r--r--source/blender/gpu/intern/gpu_draw.c3
-rw-r--r--source/blender/imbuf/intern/jp2.c2
-rw-r--r--source/blender/makesrna/intern/rna_userdef.c3
-rw-r--r--source/gameengine/GameLogic/SCA_PythonController.cpp2
17 files changed, 54 insertions, 30 deletions
diff --git a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
index 543e7e087b1..46cde625cf2 100644
--- a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
+++ b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
@@ -205,15 +205,15 @@ Operate(
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());
-}
+ }
}
diff --git a/intern/bsp/test/BSP_GhostTest/main.cpp b/intern/bsp/test/BSP_GhostTest/main.cpp
index d5fa884afa1..25185f40192 100644
--- a/intern/bsp/test/BSP_GhostTest/main.cpp
+++ b/intern/bsp/test/BSP_GhostTest/main.cpp
@@ -93,8 +93,8 @@ NewTestMesh(
#endif
-int main() {
-
+int main()
+{
MT_Vector3 min,max;
MT_Vector3 min2,max2;
diff --git a/intern/raskter/raskter.c b/intern/raskter/raskter.c
index 910cd4c6a3d..4552db10ccb 100644
--- a/intern/raskter/raskter.c
+++ b/intern/raskter/raskter.c
@@ -67,7 +67,8 @@ struct r_fill_context {
* 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 @@ static void preprocess_all_edges(struct r_fill_context *ctx, struct poly_vert *v
* 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 @@ int PLX_raskterize_feather(float (*base_verts)[2], int num_base_verts, float (*f
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 @@ float get_pixel_intensity_bilinear(float *buf, int buf_x, int buf_y, float u, fl
}
-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;
diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c
index 014b3f5e40b..edb3120cf87 100644
--- a/source/blender/blenkernel/intern/boids.c
+++ b/source/blender/blenkernel/intern/boids.c
@@ -920,7 +920,8 @@ static BoidState *get_boid_state(BoidSettings *boids, ParticleData *pa)
return state;
}
-//static int boid_condition_is_true(BoidCondition *cond) {
+//static int boid_condition_is_true(BoidCondition *cond)
+//{
// /* TODO */
// return 0;
//}
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 1f5ba8ae305..5c48b35c85a 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -3101,7 +3101,8 @@ static Object *obrel_armature_find(Object *ob)
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) {
diff --git a/source/blender/collada/MaterialExporter.cpp b/source/blender/collada/MaterialExporter.cpp
index 07e11183dd0..5a1d8b7602a 100644
--- a/source/blender/collada/MaterialExporter.cpp
+++ b/source/blender/collada/MaterialExporter.cpp
@@ -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)
diff --git a/source/blender/collada/SkinInfo.cpp b/source/blender/collada/SkinInfo.cpp
index 0116f89361b..9b0d59d66ea 100644
--- a/source/blender/collada/SkinInfo.cpp
+++ b/source/blender/collada/SkinInfo.cpp
@@ -57,7 +57,9 @@ static const char *bc_get_joint_name(T *node)
// 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),
diff --git a/source/blender/collada/TransformReader.cpp b/source/blender/collada/TransformReader.cpp
index be615f83787..d10cd7378e9 100644
--- a/source/blender/collada/TransformReader.cpp
+++ b/source/blender/collada/TransformReader.cpp
@@ -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)
diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/collada/collada_internal.cpp
index 0ee8419eda7..a4969735757 100644
--- a/source/blender/collada/collada_internal.cpp
+++ b/source/blender/collada/collada_internal.cpp
@@ -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)
diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index cf7c9e49b63..62ae5d38727 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -260,7 +260,8 @@ void bc_bubble_sort_by_Object_name(LinkNode *export_set)
* 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;
diff --git a/source/blender/compositor/intern/COM_NodeOperation.cpp b/source/blender/compositor/intern/COM_NodeOperation.cpp
index f416be5dedf..d439f5b77fe 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.cpp
+++ b/source/blender/compositor/intern/COM_NodeOperation.cpp
@@ -194,7 +194,8 @@ void NodeOperation::COM_clAttachOutputMemoryBufferToKernelParameter(cl_kernel ke
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 @@ void NodeOperation::COM_clEnqueueRange(cl_command_queue queue, cl_kernel kernel,
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();
diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
index e1018e0d037..4fff3fdcc31 100644
--- a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
+++ b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
@@ -175,7 +175,8 @@ void WriteBufferOperation::executeOpenCLRegion(cl_context context, cl_program pr
delete clKernelsToCleanUp;
}
-void WriteBufferOperation::readResolutionFromInputSocket() {
+void WriteBufferOperation::readResolutionFromInputSocket()
+{
NodeOperation *inputOperation = this->getInputOperation(0);
this->setWidth(inputOperation->getWidth());
this->setHeight(inputOperation->getHeight());
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index e2fc1b64223..0cf3586e659 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -1277,7 +1277,8 @@ void FILE_OT_hidedot(struct wmOperatorType *ot)
ot->poll = ED_operator_file_active; /* <- important, handler is on window level */
}
-struct ARegion *file_buttons_region(struct ScrArea *sa){
+struct ARegion *file_buttons_region(struct ScrArea *sa)
+{
ARegion *ar, *arnew;
for (ar = sa->regionbase.first; ar; ar = ar->next)
diff --git a/source/blender/gpu/intern/gpu_draw.c b/source/blender/gpu/intern/gpu_draw.c
index e718a486561..4197e1a3edb 100644
--- a/source/blender/gpu/intern/gpu_draw.c
+++ b/source/blender/gpu/intern/gpu_draw.c
@@ -240,7 +240,8 @@ static struct GPUTextureState {
/* Mipmap settings */
-void GPU_set_gpu_mipmapping(int gpu_mipmap){
+void GPU_set_gpu_mipmapping(int gpu_mipmap)
+{
int old_value = GTS.gpu_mipmap;
/* only actually enable if it's supported */
diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c
index a5826634724..053d88c8c32 100644
--- a/source/blender/imbuf/intern/jp2.c
+++ b/source/blender/imbuf/intern/jp2.c
@@ -332,7 +332,7 @@ struct ImBuf *imb_jp2_decode(unsigned char *mem, size_t size, int flags)
return(ibuf);
}
-//static opj_image_t* rawtoimage(const char *filename, opj_cparameters_t *parameters, raw_cparameters_t *raw_cp) {
+//static opj_image_t* rawtoimage(const char *filename, opj_cparameters_t *parameters, raw_cparameters_t *raw_cp)
/* prec can be 8, 12, 16 */
/* use inline because the float passed can be a function call that would end up being called many times */
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 42eb06b137a..f4cb4fc58f4 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -144,7 +144,8 @@ static void rna_userdef_anisotropic_update(Main *bmain, Scene *scene, PointerRNA
rna_userdef_update(bmain, scene, ptr);
}
-static void rna_userdef_gl_gpu_mipmaps(Main *bmain, Scene *scene, PointerRNA *ptr) {
+static void rna_userdef_gl_gpu_mipmaps(Main *bmain, Scene *scene, PointerRNA *ptr)
+{
GPU_set_gpu_mipmapping(U.use_gpu_mipmap);
rna_userdef_update(bmain, scene, ptr);
}
diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp
index 9c8e6fe99b4..94a8628ca79 100644
--- a/source/gameengine/GameLogic/SCA_PythonController.cpp
+++ b/source/gameengine/GameLogic/SCA_PythonController.cpp
@@ -209,7 +209,7 @@ SCA_IActuator* SCA_PythonController::LinkedActuatorFromPy(PyObject *value)
else if (PyObject_TypeCheck(value, &SCA_IActuator::Type)) {
PyObjectPlus *value_plus= BGE_PROXY_REF(value);
for (it = lacts.begin(); it!= lacts.end(); ++it) {
- if ( static_cast<SCA_IActuator*>(value_plus) == (*it) ) {
+ if (static_cast<SCA_IActuator*>(value_plus) == (*it)) {
return *it;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 06:28:48 +0300