diff options
Diffstat (limited to 'source/blender')
38 files changed, 625 insertions, 475 deletions
diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c index 96c098b37e9..6d3aea91bc4 100644 --- a/source/blender/blenkernel/intern/colortools.c +++ b/source/blender/blenkernel/intern/colortools.c @@ -1456,8 +1456,7 @@ void scopes_update(Scopes *scopes, unsigned int nl, na, nr, ng, nb; double divl, diva, divr, divg, divb; const unsigned char *display_buffer = NULL; - unsigned int bin_lum[256] = {0}, bin_r[256] = {0}, bin_g[256] = {0}, bin_b[256] = {0}, - bin_a[256] = {0}; + uint bin_lum[256] = {0}, bin_r[256] = {0}, bin_g[256] = {0}, bin_b[256] = {0}, bin_a[256] = {0}; int ycc_mode = -1; void *cache_handle = NULL; struct ColormanageProcessor *cm_processor = NULL; diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 50c72f5a57f..acb0fd350d2 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -1777,7 +1777,10 @@ static void emit_from_mesh_task_cb(void *__restrict userdata, const int index = smoke_get_index( x - data->min[0], data->res[0], y - data->min[1], data->res[1], z - data->min[2]); const float ray_start[3] = { - lx + 0.5f * data->hr, ly + 0.5f * data->hr, lz + 0.5f * data->hr}; + lx + 0.5f * data->hr, + ly + 0.5f * data->hr, + lz + 0.5f * data->hr, + }; sample_mesh(data->sfs, data->mvert, diff --git a/source/blender/blenkernel/intern/subdiv_mesh.c b/source/blender/blenkernel/intern/subdiv_mesh.c index d461394bc02..885898d9a57 100644 --- a/source/blender/blenkernel/intern/subdiv_mesh.c +++ b/source/blender/blenkernel/intern/subdiv_mesh.c @@ -267,8 +267,10 @@ static void vertex_interpolation_from_corner(const SubdivMeshContext *ctx, coarse_mloop[coarse_poly->loopstart + (first_loop_index - coarse_poly->loopstart + 1) % coarse_poly->totloop] .v}; - const int last_indices[2] = {coarse_mloop[first_loop_index].v, - coarse_mloop[last_loop_index].v}; + const int last_indices[2] = { + coarse_mloop[first_loop_index].v, + coarse_mloop[last_loop_index].v, + }; CustomData_interp(vertex_data, &vertex_interpolation->vertex_data_storage, first_indices, @@ -393,8 +395,10 @@ static void loop_interpolation_from_corner(const SubdivMeshContext *ctx, const int second_loop_index = base_loop_index + (first_loop_index - base_loop_index + 1) % coarse_poly->totloop; const int first_indices[2] = {first_loop_index, second_loop_index}; - const int last_indices[2] = {loops_of_ptex.last_loop - coarse_mloop, - loops_of_ptex.first_loop - coarse_mloop}; + const int last_indices[2] = { + loops_of_ptex.last_loop - coarse_mloop, + loops_of_ptex.first_loop - coarse_mloop, + }; CustomData_interp( loop_data, &loop_interpolation->loop_data_storage, first_indices, weights, NULL, 2, 1); CustomData_interp( diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index c478ce274b8..f176d7e0118 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -1084,10 +1084,14 @@ float *BKE_tracking_track_get_mask(int frame_width, MovieTrackingMarker *marker) { /* Convert normalized space marker's search area to pixel-space region. */ - const float region_min[2] = {marker->search_min[0] * frame_width, - marker->search_min[1] * frame_height}; - const float region_max[2] = {marker->search_max[0] * frame_width, - marker->search_max[1] * frame_height}; + const float region_min[2] = { + marker->search_min[0] * frame_width, + marker->search_min[1] * frame_height, + }; + const float region_max[2] = { + marker->search_max[0] * frame_width, + marker->search_max[1] * frame_height, + }; return tracking_track_get_mask_for_region( frame_width, frame_height, region_min, region_max, track); } diff --git a/source/blender/blenkernel/intern/tracking_util.c b/source/blender/blenkernel/intern/tracking_util.c index 4de10aca0ec..644e03af396 100644 --- a/source/blender/blenkernel/intern/tracking_util.c +++ b/source/blender/blenkernel/intern/tracking_util.c @@ -927,10 +927,14 @@ static libmv_CacheKey accessor_get_mask_for_track_callback(libmv_FrameAccessorUs BKE_movieclip_get_size(clip, &user, &frame_width, &frame_height); /* Actual mask sampling. */ MovieTrackingMarker *marker = BKE_tracking_marker_get_exact(track, frame); - const float region_min[2] = {region->min[0] - marker->pos[0] * frame_width, - region->min[1] - marker->pos[1] * frame_height}; - const float region_max[2] = {region->max[0] - marker->pos[0] * frame_width, - region->max[1] - marker->pos[1] * frame_height}; + const float region_min[2] = { + region->min[0] - marker->pos[0] * frame_width, + region->min[1] - marker->pos[1] * frame_height, + }; + const float region_max[2] = { + region->max[0] - marker->pos[0] * frame_width, + region->max[1] - marker->pos[1] * frame_height, + }; *r_destination = tracking_track_get_mask_for_region( frame_width, frame_height, region_min, region_max, track); *r_width = region->max[0] - region->min[0]; diff --git a/source/blender/blenlib/intern/expr_pylike_eval.c b/source/blender/blenlib/intern/expr_pylike_eval.c index 40df9711ef1..6dc0203ead2 100644 --- a/source/blender/blenlib/intern/expr_pylike_eval.c +++ b/source/blender/blenlib/intern/expr_pylike_eval.c @@ -356,27 +356,29 @@ typedef struct BuiltinOpDef { void *funcptr; } BuiltinOpDef; -static BuiltinOpDef builtin_ops[] = {{"radians", OPCODE_FUNC1, op_radians}, - {"degrees", OPCODE_FUNC1, op_degrees}, - {"abs", OPCODE_FUNC1, fabs}, - {"fabs", OPCODE_FUNC1, fabs}, - {"floor", OPCODE_FUNC1, floor}, - {"ceil", OPCODE_FUNC1, ceil}, - {"trunc", OPCODE_FUNC1, trunc}, - {"int", OPCODE_FUNC1, trunc}, - {"sin", OPCODE_FUNC1, sin}, - {"cos", OPCODE_FUNC1, cos}, - {"tan", OPCODE_FUNC1, tan}, - {"asin", OPCODE_FUNC1, asin}, - {"acos", OPCODE_FUNC1, acos}, - {"atan", OPCODE_FUNC1, atan}, - {"atan2", OPCODE_FUNC2, atan2}, - {"exp", OPCODE_FUNC1, exp}, - {"log", OPCODE_FUNC1, log}, - {"sqrt", OPCODE_FUNC1, sqrt}, - {"pow", OPCODE_FUNC2, pow}, - {"fmod", OPCODE_FUNC2, fmod}, - {NULL, OPCODE_CONST, NULL}}; +static BuiltinOpDef builtin_ops[] = { + {"radians", OPCODE_FUNC1, op_radians}, + {"degrees", OPCODE_FUNC1, op_degrees}, + {"abs", OPCODE_FUNC1, fabs}, + {"fabs", OPCODE_FUNC1, fabs}, + {"floor", OPCODE_FUNC1, floor}, + {"ceil", OPCODE_FUNC1, ceil}, + {"trunc", OPCODE_FUNC1, trunc}, + {"int", OPCODE_FUNC1, trunc}, + {"sin", OPCODE_FUNC1, sin}, + {"cos", OPCODE_FUNC1, cos}, + {"tan", OPCODE_FUNC1, tan}, + {"asin", OPCODE_FUNC1, asin}, + {"acos", OPCODE_FUNC1, acos}, + {"atan", OPCODE_FUNC1, atan}, + {"atan2", OPCODE_FUNC2, atan2}, + {"exp", OPCODE_FUNC1, exp}, + {"log", OPCODE_FUNC1, log}, + {"sqrt", OPCODE_FUNC1, sqrt}, + {"pow", OPCODE_FUNC2, pow}, + {"fmod", OPCODE_FUNC2, fmod}, + {NULL, OPCODE_CONST, NULL}, +}; /** \} */ @@ -413,12 +415,14 @@ typedef struct KeywordTokenDef { short token; } KeywordTokenDef; -static KeywordTokenDef keyword_list[] = {{"and", TOKEN_AND}, - {"or", TOKEN_OR}, - {"not", TOKEN_NOT}, - {"if", TOKEN_IF}, - {"else", TOKEN_ELSE}, - {NULL, TOKEN_ID}}; +static KeywordTokenDef keyword_list[] = { + {"and", TOKEN_AND}, + {"or", TOKEN_OR}, + {"not", TOKEN_NOT}, + {"if", TOKEN_IF}, + {"else", TOKEN_ELSE}, + {NULL, TOKEN_ID}, +}; typedef struct ExprParseState { int param_names_len; diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c index fd9439eb158..e6696236fac 100644 --- a/source/blender/bmesh/intern/bmesh_log.c +++ b/source/blender/bmesh/intern/bmesh_log.c @@ -307,9 +307,11 @@ static void bm_log_faces_restore(BMesh *bm, BMLog *log, GHash *faces) GHASH_ITER (gh_iter, faces) { void *key = BLI_ghashIterator_getKey(&gh_iter); BMLogFace *lf = BLI_ghashIterator_getValue(&gh_iter); - BMVert *v[3] = {bm_log_vert_from_id(log, lf->v_ids[0]), - bm_log_vert_from_id(log, lf->v_ids[1]), - bm_log_vert_from_id(log, lf->v_ids[2])}; + BMVert *v[3] = { + bm_log_vert_from_id(log, lf->v_ids[0]), + bm_log_vert_from_id(log, lf->v_ids[1]), + bm_log_vert_from_id(log, lf->v_ids[2]), + }; BMFace *f; f = BM_face_create_verts(bm, v, 3, NULL, BM_CREATE_NOP, true); diff --git a/source/blender/bmesh/operators/bmo_fill_grid.c b/source/blender/bmesh/operators/bmo_fill_grid.c index b71bd482e3b..c97a5c0f38e 100644 --- a/source/blender/bmesh/operators/bmo_fill_grid.c +++ b/source/blender/bmesh/operators/bmo_fill_grid.c @@ -682,8 +682,10 @@ void bmo_grid_fill_exec(BMesh *bm, BMOperator *op) /* add vertices if needed */ { - struct BMEdgeLoopStore *estore_pairs[2][2] = {{estore_a, estore_b}, - {estore_rail_a, estore_rail_b}}; + struct BMEdgeLoopStore *estore_pairs[2][2] = { + {estore_a, estore_b}, + {estore_rail_a, estore_rail_b}, + }; int i; for (i = 0; i < 2; i++) { diff --git a/source/blender/bmesh/operators/bmo_hull.c b/source/blender/bmesh/operators/bmo_hull.c index 46b31ce40d3..98d4431803a 100644 --- a/source/blender/bmesh/operators/bmo_hull.c +++ b/source/blender/bmesh/operators/bmo_hull.c @@ -103,9 +103,11 @@ static void hull_output_triangles(BMesh *bm, GSet *hull_triangles) int i; if (!t->skip) { - BMEdge *edges[3] = {BM_edge_create(bm, t->v[0], t->v[1], NULL, BM_CREATE_NO_DOUBLE), - BM_edge_create(bm, t->v[1], t->v[2], NULL, BM_CREATE_NO_DOUBLE), - BM_edge_create(bm, t->v[2], t->v[0], NULL, BM_CREATE_NO_DOUBLE)}; + BMEdge *edges[3] = { + BM_edge_create(bm, t->v[0], t->v[1], NULL, BM_CREATE_NO_DOUBLE), + BM_edge_create(bm, t->v[1], t->v[2], NULL, BM_CREATE_NO_DOUBLE), + BM_edge_create(bm, t->v[2], t->v[0], NULL, BM_CREATE_NO_DOUBLE), + }; BMFace *f, *example = NULL; f = BM_face_exists(t->v, 3); diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.cpp b/source/blender/compositor/intern/COM_OpenCLDevice.cpp index 12e072b9b12..b47d78af975 100644 --- a/source/blender/compositor/intern/COM_OpenCLDevice.cpp +++ b/source/blender/compositor/intern/COM_OpenCLDevice.cpp @@ -190,8 +190,10 @@ void OpenCLDevice::COM_clAttachOutputMemoryBufferToKernelParameter(cl_kernel ker void OpenCLDevice::COM_clEnqueueRange(cl_kernel kernel, MemoryBuffer *outputMemoryBuffer) { cl_int error; - const size_t size[] = {(size_t)outputMemoryBuffer->getWidth(), - (size_t)outputMemoryBuffer->getHeight()}; + const size_t size[] = { + (size_t)outputMemoryBuffer->getWidth(), + (size_t)outputMemoryBuffer->getHeight(), + }; error = clEnqueueNDRangeKernel(this->m_queue, kernel, 2, NULL, size, 0, 0, 0, NULL); if (error != CL_SUCCESS) { diff --git a/source/blender/compositor/operations/COM_MaskOperation.cpp b/source/blender/compositor/operations/COM_MaskOperation.cpp index 6f146d9e1e6..0c9208fb6bb 100644 --- a/source/blender/compositor/operations/COM_MaskOperation.cpp +++ b/source/blender/compositor/operations/COM_MaskOperation.cpp @@ -134,8 +134,10 @@ void MaskOperation::executePixelSampled(float output[4], float y, PixelSampler /*sampler*/) { - const float xy[2] = {(x * this->m_maskWidthInv) + this->m_mask_px_ofs[0], - (y * this->m_maskHeightInv) + this->m_mask_px_ofs[1]}; + const float xy[2] = { + (x * this->m_maskWidthInv) + this->m_mask_px_ofs[0], + (y * this->m_maskHeightInv) + this->m_mask_px_ofs[1], + }; if (this->m_rasterMaskHandleTot == 1) { if (this->m_rasterMaskHandles[0]) { diff --git a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp index 54d5d6e97a5..63640d43973 100644 --- a/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp +++ b/source/blender/compositor/operations/COM_PlaneCornerPinOperation.cpp @@ -125,10 +125,12 @@ void *PlaneCornerPinMaskOperation::initializeTileData(rcti *rect) */ lockMutex(); if (!m_corners_ready) { - SocketReader *readers[4] = {getInputSocketReader(0), - getInputSocketReader(1), - getInputSocketReader(2), - getInputSocketReader(3)}; + SocketReader *readers[4] = { + getInputSocketReader(0), + getInputSocketReader(1), + getInputSocketReader(2), + getInputSocketReader(3), + }; float corners[4][2]; readCornersFromSockets(rect, readers, corners); calculateCorners(corners, true, 0); @@ -183,10 +185,12 @@ void *PlaneCornerPinWarpImageOperation::initializeTileData(rcti *rect) lockMutex(); if (!m_corners_ready) { /* corner sockets start at index 1 */ - SocketReader *readers[4] = {getInputSocketReader(1), - getInputSocketReader(2), - getInputSocketReader(3), - getInputSocketReader(4)}; + SocketReader *readers[4] = { + getInputSocketReader(1), + getInputSocketReader(2), + getInputSocketReader(3), + getInputSocketReader(4), + }; float corners[4][2]; readCornersFromSockets(rect, readers, corners); calculateCorners(corners, true, 0); diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp index 8b0335754aa..02f13effc8f 100644 --- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp @@ -151,10 +151,12 @@ void VariableSizeBokehBlurOperation::executePixel(float output[4], int x, int y, if (size > this->m_threshold) { float dx = nx - x; if (size > fabsf(dx) && size > fabsf(dy)) { - float uv[2] = {(float)(COM_BLUR_BOKEH_PIXELS / 2) + - (dx / size) * (float)((COM_BLUR_BOKEH_PIXELS / 2) - 1), - (float)(COM_BLUR_BOKEH_PIXELS / 2) + - (dy / size) * (float)((COM_BLUR_BOKEH_PIXELS / 2) - 1)}; + float uv[2] = { + (float)(COM_BLUR_BOKEH_PIXELS / 2) + + (dx / size) * (float)((COM_BLUR_BOKEH_PIXELS / 2) - 1), + (float)(COM_BLUR_BOKEH_PIXELS / 2) + + (dy / size) * (float)((COM_BLUR_BOKEH_PIXELS / 2) - 1), + }; inputBokehBuffer->read(bokeh, uv[0], uv[1]); madd_v4_v4v4(color_accum, bokeh, &inputProgramFloatBuffer[offsetColorNxNy]); add_v4_v4(multiplier_accum, bokeh); diff --git a/source/blender/draw/engines/gpencil/gpencil_render.c b/source/blender/draw/engines/gpencil/gpencil_render.c index 40937f317ad..e6a3f45d60d 100644 --- a/source/blender/draw/engines/gpencil/gpencil_render.c +++ b/source/blender/draw/engines/gpencil/gpencil_render.c @@ -138,10 +138,12 @@ static void GPENCIL_render_update_viewvecs(float invproj[4][4], { /* view vectors for the corners of the view frustum. * Can be used to recreate the world space position easily */ - float view_vecs[4][4] = {{-1.0f, -1.0f, -1.0f, 1.0f}, - {1.0f, -1.0f, -1.0f, 1.0f}, - {-1.0f, 1.0f, -1.0f, 1.0f}, - {-1.0f, -1.0f, 1.0f, 1.0f}}; + float view_vecs[4][4] = { + {-1.0f, -1.0f, -1.0f, 1.0f}, + {1.0f, -1.0f, -1.0f, 1.0f}, + {-1.0f, 1.0f, -1.0f, 1.0f}, + {-1.0f, -1.0f, 1.0f, 1.0f}, + }; /* convert the view vectors to view space */ const bool is_persp = (winmat[3][3] == 0.0f); diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c index 7099f6ca573..6b6a79bfb60 100644 --- a/source/blender/draw/intern/draw_cache.c +++ b/source/blender/draw/intern/draw_cache.c @@ -482,8 +482,9 @@ GPUBatch *DRW_cache_empty_cube_get(void) {1.0f, 1.0f, 1.0f}, }; - const GLubyte indices[24] = {0, 1, 1, 3, 3, 2, 2, 0, 0, 4, 4, 5, - 5, 7, 7, 6, 6, 4, 1, 5, 3, 7, 2, 6}; + const GLubyte indices[24] = { + 0, 1, 1, 3, 3, 2, 2, 0, 0, 4, 4, 5, 5, 7, 7, 6, 6, 4, 1, 5, 3, 7, 2, 6, + }; /* Position Only 3D format */ static GPUVertFormat format = {0}; @@ -659,17 +660,20 @@ GPUBatch *DRW_cache_gpencil_axes_get(void) float v2[3] = {0.0f, 0.0f, 0.0f}; /* cube data */ - const GLfloat verts[8][3] = {{-0.25f, -0.25f, -0.25f}, - {-0.25f, -0.25f, 0.25f}, - {-0.25f, 0.25f, -0.25f}, - {-0.25f, 0.25f, 0.25f}, - {0.25f, -0.25f, -0.25f}, - {0.25f, -0.25f, 0.25f}, - {0.25f, 0.25f, -0.25f}, - {0.25f, 0.25f, 0.25f}}; - - const GLubyte indices[24] = {0, 1, 1, 3, 3, 2, 2, 0, 0, 4, 4, 5, - 5, 7, 7, 6, 6, 4, 1, 5, 3, 7, 2, 6}; + const GLfloat verts[8][3] = { + {-0.25f, -0.25f, -0.25f}, + {-0.25f, -0.25f, 0.25f}, + {-0.25f, 0.25f, -0.25f}, + {-0.25f, 0.25f, 0.25f}, + {0.25f, -0.25f, -0.25f}, + {0.25f, -0.25f, 0.25f}, + {0.25f, 0.25f, -0.25f}, + {0.25f, 0.25f, 0.25f}, + }; + + const GLubyte indices[24] = { + 0, 1, 1, 3, 3, 2, 2, 0, 0, 4, 4, 5, 5, 7, 7, 6, 6, 4, 1, 5, 3, 7, 2, 6, + }; /* Position Only 3D format */ static GPUVertFormat format = {0}; @@ -1746,11 +1750,13 @@ GPUBatch *DRW_cache_light_spot_volume_get(void) GPUBatch *DRW_cache_light_spot_square_get(void) { if (!SHC.drw_light_spot_square) { - float p[5][3] = {{0.0f, 0.0f, 0.0f}, - {1.0f, 1.0f, -1.0f}, - {1.0f, -1.0f, -1.0f}, - {-1.0f, -1.0f, -1.0f}, - {-1.0f, 1.0f, -1.0f}}; + float p[5][3] = { + {0.0f, 0.0f, 0.0f}, + {1.0f, 1.0f, -1.0f}, + {1.0f, -1.0f, -1.0f}, + {-1.0f, -1.0f, -1.0f}, + {-1.0f, 1.0f, -1.0f}, + }; uint v_idx = 0; @@ -1783,11 +1789,13 @@ GPUBatch *DRW_cache_light_spot_square_get(void) GPUBatch *DRW_cache_light_spot_square_volume_get(void) { if (!SHC.drw_light_spot_square_volume) { - float p[5][3] = {{0.0f, 0.0f, 0.0f}, - {1.0f, 1.0f, -1.0f}, - {1.0f, -1.0f, -1.0f}, - {-1.0f, -1.0f, -1.0f}, - {-1.0f, 1.0f, -1.0f}}; + float p[5][3] = { + {0.0f, 0.0f, 0.0f}, + {1.0f, 1.0f, -1.0f}, + {1.0f, -1.0f, -1.0f}, + {-1.0f, -1.0f, -1.0f}, + {-1.0f, 1.0f, -1.0f}, + }; uint v_idx = 0; diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 1072efb7edd..7d42f59fea0 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -1854,8 +1854,10 @@ static void camera_view3d_stereoscopy_display_extra(OBJECT_ShadingGroupList *sgl static float one = 1.0f; float plane_mat[4][4], scale_mat[4][4]; float scale_factor[3] = {1.0f, 1.0f, 1.0f}; - float color_plane[2][4] = {{0.0f, 0.0f, 0.0f, v3d->stereo3d_convergence_alpha}, - {0.0f, 0.0f, 0.0f, 1.0f}}; + float color_plane[2][4] = { + {0.0f, 0.0f, 0.0f, v3d->stereo3d_convergence_alpha}, + {0.0f, 0.0f, 0.0f, 1.0f}, + }; const float height = convergence_plane[1][1] - convergence_plane[0][1]; const float width = convergence_plane[2][0] - convergence_plane[0][0]; @@ -1878,9 +1880,11 @@ static void camera_view3d_stereoscopy_display_extra(OBJECT_ShadingGroupList *sgl /* Draw convergence volume. */ if (is_stereo3d_volume && !is_select) { static float one = 1.0f; - float color_volume[3][4] = {{0.0f, 1.0f, 1.0f, v3d->stereo3d_volume_alpha}, - {1.0f, 0.0f, 0.0f, v3d->stereo3d_volume_alpha}, - {0.0f, 0.0f, 0.0f, 1.0f}}; + float color_volume[3][4] = { + {0.0f, 1.0f, 1.0f, v3d->stereo3d_volume_alpha}, + {1.0f, 0.0f, 0.0f, v3d->stereo3d_volume_alpha}, + {0.0f, 0.0f, 0.0f, 1.0f}, + }; for (int eye = 0; eye < 2; eye++) { float winmat[4][4], viewinv[4][4], viewmat[4][4], persmat[4][4], persinv[4][4]; diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c index 77658b8495e..ee1d3c8eba4 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c +++ b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.c @@ -573,8 +573,10 @@ static void cage2d_draw_circle_handles(const rctf *r, } if (transform_flag & ED_GIZMO_CAGE2D_XFORM_FLAG_ROTATE) { - const float handle[2] = {BLI_rctf_cent_x(r), - r->ymax + (margin[1] * GIZMO_MARGIN_OFFSET_SCALE)}; + const float handle[2] = { + BLI_rctf_cent_x(r), + r->ymax + (margin[1] * GIZMO_MARGIN_OFFSET_SCALE), + }; circle_fn(pos, handle[0], handle[1], rad[0], rad[1], resolu); } diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index e6148ba8c93..3edf8e5135a 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -1375,14 +1375,16 @@ static bool ui_but_event_property_operator_string(const bContext *C, * * --Matt 07/2006 */ -const char ui_radial_dir_order[8] = {UI_RADIAL_W, - UI_RADIAL_E, - UI_RADIAL_S, - UI_RADIAL_N, - UI_RADIAL_NW, - UI_RADIAL_NE, - UI_RADIAL_SW, - UI_RADIAL_SE}; +const char ui_radial_dir_order[8] = { + UI_RADIAL_W, + UI_RADIAL_E, + UI_RADIAL_S, + UI_RADIAL_N, + UI_RADIAL_NW, + UI_RADIAL_NE, + UI_RADIAL_SW, + UI_RADIAL_SE, +}; const char ui_radial_dir_to_numpad[8] = {8, 9, 6, 3, 2, 1, 4, 7}; const short ui_radial_dir_to_angle[8] = {90, 45, 0, 315, 270, 225, 180, 135}; diff --git a/source/blender/editors/interface/interface_draw.c b/source/blender/editors/interface/interface_draw.c index efc748d39a1..671a004f9fe 100644 --- a/source/blender/editors/interface/interface_draw.c +++ b/source/blender/editors/interface/interface_draw.c @@ -1333,12 +1333,14 @@ void ui_draw_but_VECTORSCOPE(ARegion *UNUSED(ar), const float skin_rad = DEG2RADF(123.0f); /* angle in radians of the skin tone line */ Scopes *scopes = (Scopes *)but->poin; - const float colors[6][3] = {{0.75, 0.0, 0.0}, - {0.75, 0.75, 0.0}, - {0.0, 0.75, 0.0}, - {0.0, 0.75, 0.75}, - {0.0, 0.0, 0.75}, - {0.75, 0.0, 0.75}}; + const float colors[6][3] = { + {0.75, 0.0, 0.0}, + {0.75, 0.75, 0.0}, + {0.0, 0.75, 0.0}, + {0.0, 0.75, 0.75}, + {0.0, 0.0, 0.75}, + {0.75, 0.0, 0.75}, + }; rctf rect = { .xmin = (float)recti->xmin + 1, diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index b05dac83716..4320760cf96 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -69,10 +69,12 @@ #include "physics_intern.h" -static float I[4][4] = {{1.0f, 0.0f, 0.0f, 0.0f}, - {0.0f, 1.0f, 0.0f, 0.0f}, - {0.0f, 0.0f, 1.0f, 0.0f}, - {0.0f, 0.0f, 0.0f, 1.0f}}; +static float I[4][4] = { + {1.0f, 0.0f, 0.0f, 0.0f}, + {0.0f, 1.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 1.0f, 0.0f}, + {0.0f, 0.0f, 0.0f, 1.0f}, +}; /********************** particle system slot operators *********************/ diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index b4ea97d6e04..1aa54bcd8b5 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -776,26 +776,28 @@ static void area_azone_initialize(wmWindow *win, const bScreen *screen, ScrArea return; } - float coords[4][4] = {/* Bottom-left. */ - {sa->totrct.xmin - U.pixelsize, - sa->totrct.ymin - U.pixelsize, - sa->totrct.xmin + AZONESPOTW, - sa->totrct.ymin + AZONESPOTH}, - /* Bottom-right. */ - {sa->totrct.xmax - AZONESPOTW, - sa->totrct.ymin - U.pixelsize, - sa->totrct.xmax + U.pixelsize, - sa->totrct.ymin + AZONESPOTH}, - /* Top-left. */ - {sa->totrct.xmin - U.pixelsize, - sa->totrct.ymax - AZONESPOTH, - sa->totrct.xmin + AZONESPOTW, - sa->totrct.ymax + U.pixelsize}, - /* Top-right. */ - {sa->totrct.xmax - AZONESPOTW, - sa->totrct.ymax - AZONESPOTH, - sa->totrct.xmax + U.pixelsize, - sa->totrct.ymax + U.pixelsize}}; + float coords[4][4] = { + /* Bottom-left. */ + {sa->totrct.xmin - U.pixelsize, + sa->totrct.ymin - U.pixelsize, + sa->totrct.xmin + AZONESPOTW, + sa->totrct.ymin + AZONESPOTH}, + /* Bottom-right. */ + {sa->totrct.xmax - AZONESPOTW, + sa->totrct.ymin - U.pixelsize, + sa->totrct.xmax + U.pixelsize, + sa->totrct.ymin + AZONESPOTH}, + /* Top-left. */ + {sa->totrct.xmin - U.pixelsize, + sa->totrct.ymax - AZONESPOTH, + sa->totrct.xmin + AZONESPOTW, + sa->totrct.ymax + U.pixelsize}, + /* Top-right. */ + {sa->totrct.xmax - AZONESPOTW, + sa->totrct.ymax - AZONESPOTH, + sa->totrct.xmax + U.pixelsize, + sa->totrct.ymax + U.pixelsize}, + }; for (int i = 0; i < 4; i++) { /* can't click on bottom corners on OS X, already used for resizing */ diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index 719403531ff..d26907cdd3f 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -65,53 +65,55 @@ #include "screen_intern.h" -const char *screen_context_dir[] = {"scene", - "view_layer", - "visible_objects", - "visible_bases", - "selectable_objects", - "selectable_bases", - "selected_objects", - "selected_bases", - "editable_objects", - "editable_bases", - "selected_editable_objects", - "selected_editable_bases", - "objects_in_mode", - "objects_in_mode_unique_data", - "visible_bones", - "editable_bones", - "selected_bones", - "selected_editable_bones", - "visible_pose_bones", - "selected_pose_bones", - "selected_pose_bones_from_active_object", - "active_bone", - "active_pose_bone", - "active_base", - "active_object", - "object", - "edit_object", - "sculpt_object", - "vertex_paint_object", - "weight_paint_object", - "image_paint_object", - "particle_edit_object", - "uv_sculpt_object", - "pose_object", - "sequences", - "selected_sequences", - "selected_editable_sequences", /* sequencer */ - "gpencil_data", - "gpencil_data_owner", /* grease pencil data */ - "visible_gpencil_layers", - "editable_gpencil_layers", - "editable_gpencil_strokes", - "active_gpencil_layer", - "active_gpencil_frame", - "active_operator", - "selected_editable_fcurves", - NULL}; +const char *screen_context_dir[] = { + "scene", + "view_layer", + "visible_objects", + "visible_bases", + "selectable_objects", + "selectable_bases", + "selected_objects", + "selected_bases", + "editable_objects", + "editable_bases", + "selected_editable_objects", + "selected_editable_bases", + "objects_in_mode", + "objects_in_mode_unique_data", + "visible_bones", + "editable_bones", + "selected_bones", + "selected_editable_bones", + "visible_pose_bones", + "selected_pose_bones", + "selected_pose_bones_from_active_object", + "active_bone", + "active_pose_bone", + "active_base", + "active_object", + "object", + "edit_object", + "sculpt_object", + "vertex_paint_object", + "weight_paint_object", + "image_paint_object", + "particle_edit_object", + "uv_sculpt_object", + "pose_object", + "sequences", + "selected_sequences", + "selected_editable_sequences", /* sequencer */ + "gpencil_data", + "gpencil_data_owner", /* grease pencil data */ + "visible_gpencil_layers", + "editable_gpencil_layers", + "editable_gpencil_strokes", + "active_gpencil_layer", + "active_gpencil_frame", + "active_operator", + "selected_editable_fcurves", + NULL, +}; int ed_screen_context(const bContext *C, const char *member, bContextDataResult *result) { diff --git a/source/blender/editors/space_clip/tracking_ops_orient.c b/source/blender/editors/space_clip/tracking_ops_orient.c index e13598b0322..6efc80c5c05 100644 --- a/source/blender/editors/space_clip/tracking_ops_orient.c +++ b/source/blender/editors/space_clip/tracking_ops_orient.c @@ -399,10 +399,12 @@ static int set_plane_exec(bContext *C, wmOperator *op) int tot = 0; float vec[3][3], mat[4][4], obmat[4][4], newmat[4][4], orig[3] = {0.0f, 0.0f, 0.0f}; int plane = RNA_enum_get(op->ptr, "plane"); - float rot[4][4] = {{0.0f, 0.0f, -1.0f, 0.0f}, - {0.0f, 1.0f, 0.0f, 0.0f}, - {1.0f, 0.0f, 0.0f, 0.0f}, - {0.0f, 0.0f, 0.0f, 1.0f}}; /* 90 degrees Y-axis rotation matrix */ + float rot[4][4] = { + {0.0f, 0.0f, -1.0f, 0.0f}, + {0.0f, 1.0f, 0.0f, 0.0f}, + {1.0f, 0.0f, 0.0f, 0.0f}, + {0.0f, 0.0f, 0.0f, 1.0f}, + }; /* 90 degrees Y-axis rotation matrix */ if (count_selected_bundles(C) != 3) { BKE_report(op->reports, RPT_ERROR, "Three tracks with bundles are needed to orient the floor"); diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 8b4c1c30959..c0770392eff 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -780,8 +780,10 @@ int getTransformOrientation_ex(const bContext *C, if (BM_vert_edge_pair(v, &e_pair[0], &e_pair[1])) { bool v_pair_swap = false; - BMVert *v_pair[2] = {BM_edge_other_vert(e_pair[0], v), - BM_edge_other_vert(e_pair[1], v)}; + BMVert *v_pair[2] = { + BM_edge_other_vert(e_pair[0], v), + BM_edge_other_vert(e_pair[1], v), + }; float dir_pair[2][3]; if (BM_edge_is_boundary(e_pair[0])) { diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index 503910d1734..ccaa0d68475 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -391,8 +391,10 @@ void ED_region_draw_mouse_line_cb(const bContext *C, ARegion *ar, void *arg_info { wmWindow *win = CTX_wm_window(C); const float *mval_src = (float *)arg_info; - const float mval_dst[2] = {win->eventstate->x - ar->winrct.xmin, - win->eventstate->y - ar->winrct.ymin}; + const float mval_dst[2] = { + win->eventstate->x - ar->winrct.xmin, + win->eventstate->y - ar->winrct.ymin, + }; const uint shdr_pos = GPU_vertformat_attr_add( immVertexFormat(), "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT); diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp index bc0bc5bd721..57d8f3201b1 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp @@ -70,15 +70,17 @@ static int IncreasingColorShader___init__(BPy_IncreasingColorShader *self, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"red_min", - "green_min", - "blue_min", - "alpha_min", - "red_max", - "green_max", - "blue_max", - "alpha_max", - NULL}; + static const char *kwlist[] = { + "red_min", + "green_min", + "blue_min", + "alpha_min", + "red_max", + "green_max", + "blue_max", + "alpha_max", + NULL, + }; float f1, f2, f3, f4, f5, f6, f7, f8; if (!PyArg_ParseTupleAndKeywords( diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp index 72d5799412f..51a0c670d75 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_SmoothingShader.cpp @@ -71,15 +71,17 @@ static char SmoothingShader___doc__[] = static int SmoothingShader___init__(BPy_SmoothingShader *self, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"num_iterations", - "factor_point", - "factor_curvature", - "factor_curvature_difference", - "aniso_point", - "aniso_normal", - "aniso_curvature", - "carricature_factor", - NULL}; + static const char *kwlist[] = { + "num_iterations", + "factor_point", + "factor_curvature", + "factor_curvature_difference", + "aniso_point", + "aniso_normal", + "aniso_curvature", + "carricature_factor", + NULL, + }; int i1 = 100; double d2 = 0.1, d3 = 0.0, d4 = 0.2, d5 = 0.0, d6 = 0.0, d7 = 0.0, d8 = 1.0; diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c index ccab0164df7..3ce168fd37f 100644 --- a/source/blender/imbuf/intern/indexer.c +++ b/source/blender/imbuf/intern/indexer.c @@ -52,10 +52,12 @@ static const int proxy_sizes[] = {IMB_PROXY_25, IMB_PROXY_50, IMB_PROXY_75, IMB_ static const float proxy_fac[] = {0.25, 0.50, 0.75, 1.00}; #ifdef WITH_FFMPEG -static int tc_types[] = {IMB_TC_RECORD_RUN, - IMB_TC_FREE_RUN, - IMB_TC_INTERPOLATED_REC_DATE_FREE_RUN, - IMB_TC_RECORD_RUN_NO_GAPS}; +static int tc_types[] = { + IMB_TC_RECORD_RUN, + IMB_TC_FREE_RUN, + IMB_TC_INTERPOLATED_REC_DATE_FREE_RUN, + IMB_TC_RECORD_RUN_NO_GAPS, +}; #endif #define INDEX_FILE_VERSION 1 diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 848944262e8..ccf9c0c254d 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1143,14 +1143,16 @@ static void rna_ImageFormatSettings_file_format_set(PointerRNA *ptr, int value) const int depth_ok = BKE_imtype_valid_depths(imf->imtype); if ((imf->depth & depth_ok) == 0) { /* set first available depth */ - char depth_ls[] = {R_IMF_CHAN_DEPTH_32, - R_IMF_CHAN_DEPTH_24, - R_IMF_CHAN_DEPTH_16, - R_IMF_CHAN_DEPTH_12, - R_IMF_CHAN_DEPTH_10, - R_IMF_CHAN_DEPTH_8, - R_IMF_CHAN_DEPTH_1, - 0}; + char depth_ls[] = { + R_IMF_CHAN_DEPTH_32, + R_IMF_CHAN_DEPTH_24, + R_IMF_CHAN_DEPTH_16, + R_IMF_CHAN_DEPTH_12, + R_IMF_CHAN_DEPTH_10, + R_IMF_CHAN_DEPTH_8, + R_IMF_CHAN_DEPTH_1, + 0, + }; int i; for (i = 0; depth_ls[i]; i++) { diff --git a/source/blender/modifiers/intern/MOD_skin.c b/source/blender/modifiers/intern/MOD_skin.c index e114483759e..74381a491b5 100644 --- a/source/blender/modifiers/intern/MOD_skin.c +++ b/source/blender/modifiers/intern/MOD_skin.c @@ -952,10 +952,12 @@ static void add_poly(SkinOutput *so, BMVert *v1, BMVert *v2, BMVert *v3, BMVert static void connect_frames(SkinOutput *so, BMVert *frame1[4], BMVert *frame2[4]) { - BMVert *q[4][4] = {{frame2[0], frame2[1], frame1[1], frame1[0]}, - {frame2[1], frame2[2], frame1[2], frame1[1]}, - {frame2[2], frame2[3], frame1[3], frame1[2]}, - {frame2[3], frame2[0], frame1[0], frame1[3]}}; + BMVert *q[4][4] = { + {frame2[0], frame2[1], frame1[1], frame1[0]}, + {frame2[1], frame2[2], frame1[2], frame1[1]}, + {frame2[2], frame2[3], frame1[3], frame1[2]}, + {frame2[3], frame2[0], frame1[0], frame1[3]}, + }; int i; bool swap; diff --git a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c index 8c46349e091..0d599616037 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c +++ b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c @@ -29,8 +29,10 @@ static bNodeSocketTemplate cmp_node_bilateralblur_in[] = { {SOCK_RGBA, 1, N_("Determinator"), 1.0f, 1.0f, 1.0f, 1.0f}, {-1, 0, ""}}; -static bNodeSocketTemplate cmp_node_bilateralblur_out[] = {{SOCK_RGBA, 0, N_("Image")}, - {-1, 0, ""}}; +static bNodeSocketTemplate cmp_node_bilateralblur_out[] = { + {SOCK_RGBA, 0, N_("Image")}, + {-1, 0, ""}, +}; static void node_composit_init_bilateralblur(bNodeTree *UNUSED(ntree), bNode *node) { diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c b/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c index 82d35dc6118..c850edc49b1 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c +++ b/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c @@ -26,11 +26,13 @@ /* **************** SEPARATE YCCA ******************** */ static bNodeSocketTemplate cmp_node_sepycca_in[] = { {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f}, {-1, 0, ""}}; -static bNodeSocketTemplate cmp_node_sepycca_out[] = {{SOCK_FLOAT, 0, N_("Y")}, - {SOCK_FLOAT, 0, N_("Cb")}, - {SOCK_FLOAT, 0, N_("Cr")}, - {SOCK_FLOAT, 0, N_("A")}, - {-1, 0, ""}}; +static bNodeSocketTemplate cmp_node_sepycca_out[] = { + {SOCK_FLOAT, 0, N_("Y")}, + {SOCK_FLOAT, 0, N_("Cb")}, + {SOCK_FLOAT, 0, N_("Cr")}, + {SOCK_FLOAT, 0, N_("A")}, + {-1, 0, ""}, +}; static void node_composit_init_mode_sepycca(bNodeTree *UNUSED(ntree), bNode *node) { diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c b/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c index b3277da2586..045bb1b81ba 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c +++ b/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c @@ -26,11 +26,13 @@ /* **************** SEPARATE YUVA ******************** */ static bNodeSocketTemplate cmp_node_sepyuva_in[] = { {SOCK_RGBA, 1, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f}, {-1, 0, ""}}; -static bNodeSocketTemplate cmp_node_sepyuva_out[] = {{SOCK_FLOAT, 0, N_("Y")}, - {SOCK_FLOAT, 0, N_("U")}, - {SOCK_FLOAT, 0, N_("V")}, - {SOCK_FLOAT, 0, N_("A")}, - {-1, 0, ""}}; +static bNodeSocketTemplate cmp_node_sepyuva_out[] = { + {SOCK_FLOAT, 0, N_("Y")}, + {SOCK_FLOAT, 0, N_("U")}, + {SOCK_FLOAT, 0, N_("V")}, + {SOCK_FLOAT, 0, N_("A")}, + {-1, 0, ""}, +}; void register_node_type_cmp_sepyuva(void) { diff --git a/source/blender/nodes/shader/nodes/node_shader_vectTransform.c b/source/blender/nodes/shader/nodes/node_shader_vectTransform.c index 19cc9f2ce55..08a53c1d53d 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vectTransform.c +++ b/source/blender/nodes/shader/nodes/node_shader_vectTransform.c @@ -28,8 +28,10 @@ static bNodeSocketTemplate sh_node_vect_transform_in[] = { {SOCK_VECTOR, 1, N_("Vector"), 0.5f, 0.5f, 0.5f, 1.0f, -10000.0f, 10000.0f, PROP_NONE}, {-1, 0, ""}}; -static bNodeSocketTemplate sh_node_vect_transform_out[] = {{SOCK_VECTOR, 0, N_("Vector")}, - {-1, 0, ""}}; +static bNodeSocketTemplate sh_node_vect_transform_out[] = { + {SOCK_VECTOR, 0, N_("Vector")}, + {-1, 0, ""}, +}; static void node_shader_init_vect_transform(bNodeTree *UNUSED(ntree), bNode *node) { diff --git a/source/blender/python/intern/bpy.c b/source/blender/python/intern/bpy.c index ed576c553e4..08f4df543a8 100644 --- a/source/blender/python/intern/bpy.c +++ b/source/blender/python/intern/bpy.c @@ -274,19 +274,35 @@ static PyObject *bpy_escape_identifier(PyObject *UNUSED(self), PyObject *value) } static PyMethodDef meth_bpy_script_paths = { - "script_paths", (PyCFunction)bpy_script_paths, METH_NOARGS, bpy_script_paths_doc}; -static PyMethodDef meth_bpy_blend_paths = {"blend_paths", - (PyCFunction)bpy_blend_paths, - METH_VARARGS | METH_KEYWORDS, - bpy_blend_paths_doc}; + "script_paths", + (PyCFunction)bpy_script_paths, + METH_NOARGS, + bpy_script_paths_doc, +}; +static PyMethodDef meth_bpy_blend_paths = { + "blend_paths", + (PyCFunction)bpy_blend_paths, + METH_VARARGS | METH_KEYWORDS, + bpy_blend_paths_doc, +}; static PyMethodDef meth_bpy_user_resource = { - "user_resource", (PyCFunction)bpy_user_resource, METH_VARARGS | METH_KEYWORDS, NULL}; -static PyMethodDef meth_bpy_resource_path = {"resource_path", - (PyCFunction)bpy_resource_path, - METH_VARARGS | METH_KEYWORDS, - bpy_resource_path_doc}; + "user_resource", + (PyCFunction)bpy_user_resource, + METH_VARARGS | METH_KEYWORDS, + NULL, +}; +static PyMethodDef meth_bpy_resource_path = { + "resource_path", + (PyCFunction)bpy_resource_path, + METH_VARARGS | METH_KEYWORDS, + bpy_resource_path_doc, +}; static PyMethodDef meth_bpy_escape_identifier = { - "escape_identifier", (PyCFunction)bpy_escape_identifier, METH_O, bpy_escape_identifier_doc}; + "escape_identifier", + (PyCFunction)bpy_escape_identifier, + METH_O, + bpy_escape_identifier_doc, +}; static PyObject *bpy_import_test(const char *modname) { diff --git a/source/blender/python/intern/bpy_rna_id_collection.c b/source/blender/python/intern/bpy_rna_id_collection.c index bb7604aea97..825961e807b 100644 --- a/source/blender/python/intern/bpy_rna_id_collection.c +++ b/source/blender/python/intern/bpy_rna_id_collection.c @@ -378,10 +378,12 @@ int BPY_rna_id_collection_module(PyObject *mod_par) PyModule_AddObject(mod_par, "_rna_id_collection_user_map", PyCFunction_New(&user_map, NULL)); - static PyMethodDef batch_remove = {"batch_remove", - (PyCFunction)bpy_batch_remove, - METH_VARARGS | METH_KEYWORDS, - bpy_batch_remove_doc}; + static PyMethodDef batch_remove = { + "batch_remove", + (PyCFunction)bpy_batch_remove, + METH_VARARGS | METH_KEYWORDS, + bpy_batch_remove_doc, + }; PyModule_AddObject( mod_par, "_rna_id_collection_batch_remove", PyCFunction_New(&batch_remove, NULL)); diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c index 45f56968a32..58cfc350b17 100644 --- a/source/blender/windowmanager/intern/wm_cursors.c +++ b/source/blender/windowmanager/intern/wm_cursors.c @@ -386,13 +386,17 @@ void WM_cursor_time(wmWindow *win, int nr) * I define 2 pretty brain-dead macros so it's obvious what the extra "[]" * are for */ -#define BEGIN_CURSOR_BLOCK { -#define END_CURSOR_BLOCK } +#define BEGIN_CURSOR_BLOCK \ + { \ + ((void)0) +#define END_CURSOR_BLOCK \ + } \ + ((void)0) void wm_init_cursor_data(void) { /********************** NW_ARROW Cursor **************************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char nw_sbm[] = { 0x03, 0x00, 0x05, 0x00, 0x09, 0x00, 0x11, 0x00, 0x21, 0x00, 0x41, 0x00, 0x81, 0x00, 0x01, 0x01, 0x01, 0x02, 0xc1, 0x03, 0x49, 0x00, @@ -426,10 +430,10 @@ void wm_init_cursor_data(void) }; BlenderCursor[BC_NW_ARROWCURSOR] = &NWArrowCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; ///********************** NS_ARROW Cursor *************************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char ns_sbm[] = { 0x40, 0x01, 0x20, 0x02, 0x10, 0x04, 0x08, 0x08, 0x04, 0x10, 0x3c, 0x1e, 0x20, 0x02, 0x20, 0x02, 0x20, 0x02, 0x20, 0x02, 0x3c, 0x1e, @@ -464,9 +468,9 @@ void wm_init_cursor_data(void) BlenderCursor[BC_NS_ARROWCURSOR] = &NSArrowCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** EW_ARROW Cursor *************************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char ew_sbm[] = { 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x38, 0x1c, 0x2c, 0x34, 0xe6, 0x67, 0x03, 0xc0, 0x01, 0x80, 0x03, 0xc0, 0xe6, 0x67, 0x2c, 0x34, @@ -500,10 +504,10 @@ void wm_init_cursor_data(void) }; BlenderCursor[BC_EW_ARROWCURSOR] = &EWArrowCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Wait Cursor *****************************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char wait_sbm[] = { 0xfe, 0x7f, 0x02, 0x40, 0x02, 0x40, 0x84, 0x21, 0xc8, 0x13, 0xd0, 0x0b, 0xa0, 0x04, 0x20, 0x05, 0xa0, 0x04, 0x10, 0x09, 0x88, 0x11, @@ -561,10 +565,10 @@ void wm_init_cursor_data(void) }; BlenderCursor[BC_WAITCURSOR] = &WaitCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Cross Cursor ***************************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char cross_sbm[] = { 0x00, 0x00, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x7e, 0x7e, 0x7e, 0x7e, 0x80, 0x01, 0x80, 0x01, @@ -621,10 +625,10 @@ void wm_init_cursor_data(void) }; BlenderCursor[BC_CROSSCURSOR] = &CrossCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** EditCross Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char editcross_sbm[] = { 0x0e, 0x00, 0x11, 0x00, 0x1d, 0x00, 0x19, 0x03, 0x1d, 0x03, 0x11, 0x03, 0x0e, 0x03, 0x00, 0x03, 0xf8, 0x7c, 0xf8, 0x7c, 0x00, 0x03, @@ -658,10 +662,10 @@ void wm_init_cursor_data(void) }; BlenderCursor[BC_EDITCROSSCURSOR] = &EditCrossCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Box Select *************************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char box_sbm[32] = { 0x7f, 0x00, 0x41, 0x00, 0x41, 0x00, 0x41, 0x06, 0x41, 0x06, 0x41, 0x06, 0x7f, 0x06, 0x00, 0x06, 0xe0, 0x79, 0xe0, 0x79, 0x00, 0x06, @@ -696,9 +700,9 @@ void wm_init_cursor_data(void) BlenderCursor[BC_BOXSELCURSOR] = &BoxSelCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Knife Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char knife_sbm[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x2c, 0x00, 0x5a, 0x00, 0x34, 0x00, 0x2a, 0x00, 0x17, 0x80, 0x06, 0x40, 0x03, 0xa0, 0x03, @@ -757,10 +761,10 @@ void wm_init_cursor_data(void) BlenderCursor[BC_KNIFECURSOR] = &KnifeCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Loop Select Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char vloop_sbm[] = { 0x00, 0x00, 0x7e, 0x00, 0x3e, 0x00, 0x1e, 0x00, 0x0e, 0x00, 0x66, @@ -820,10 +824,10 @@ void wm_init_cursor_data(void) BlenderCursor[BC_VLOOPCURSOR] = &VLoopCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** TextEdit Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char textedit_sbm[] = { 0xe0, 0x03, 0x10, 0x04, 0x60, 0x03, 0x40, 0x01, 0x40, 0x01, 0x40, 0x01, 0x40, 0x01, 0x40, 0x01, 0x40, 0x01, 0x40, 0x01, 0x40, 0x01, @@ -857,10 +861,10 @@ void wm_init_cursor_data(void) }; BlenderCursor[BC_TEXTEDITCURSOR] = &TextEditCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Paintbrush Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char paintbrush_sbm[] = { 0x00, 0xe0, 0x00, 0x98, 0x00, 0x44, 0x00, 0x42, 0x00, 0x21, 0x80, @@ -895,10 +899,10 @@ void wm_init_cursor_data(void) }; BlenderCursor[BC_PAINTBRUSHCURSOR] = &PaintBrushCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Hand Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char hand_sbm[] = { 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x80, 0x0d, 0x98, 0x6d, 0x98, @@ -934,10 +938,10 @@ void wm_init_cursor_data(void) BlenderCursor[BC_HANDCURSOR] = &HandCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** NSEW Scroll Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char nsewscroll_sbm[] = { 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, @@ -973,10 +977,10 @@ void wm_init_cursor_data(void) BlenderCursor[BC_NSEW_SCROLLCURSOR] = &NSEWScrollCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** NS Scroll Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char nsscroll_sbm[] = { 0x00, 0x00, 0x80, 0x01, 0xc0, 0x03, 0xc0, 0x03, 0x00, 0x00, 0x00, @@ -1012,10 +1016,10 @@ void wm_init_cursor_data(void) BlenderCursor[BC_NS_SCROLLCURSOR] = &NSScrollCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** EW Scroll Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char ewscroll_sbm[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1051,10 +1055,10 @@ void wm_init_cursor_data(void) BlenderCursor[BC_EW_SCROLLCURSOR] = &EWScrollCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Eyedropper Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char eyedropper_sbm[] = { 0x00, 0x30, 0x00, 0x48, 0x00, 0x85, 0x80, 0x82, 0x40, 0x40, 0x80, @@ -1090,10 +1094,10 @@ void wm_init_cursor_data(void) BlenderCursor[BC_EYEDROPPER_CURSOR] = &EyedropperCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Swap Area Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; static char swap_sbm[] = { 0xc0, 0xff, 0x40, 0x80, 0x40, 0x80, 0x40, 0x9c, 0x40, 0x98, 0x40, 0x94, 0x00, 0x82, 0xfe, 0x80, 0x7e, 0xfd, 0xbe, 0x01, 0xda, 0x01, @@ -1128,18 +1132,22 @@ void wm_init_cursor_data(void) BlenderCursor[BC_SWAPAREA_CURSOR] = &SwapCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Horizontal Split Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; - static char hsplit_sbm[] = {0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x88, - 0x08, 0x8C, 0x18, 0x8E, 0x38, 0x8C, 0x18, 0x88, 0x08, 0x80, 0x00, - 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00}; + static char hsplit_sbm[] = { + 0x00, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x88, + 0x08, 0x8C, 0x18, 0x8E, 0x38, 0x8C, 0x18, 0x88, 0x08, 0x80, 0x00, + 0x80, 0x00, 0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, + }; - static char hsplit_smsk[] = {0xC0, 0x01, 0xC0, 0x01, 0xC0, 0x01, 0xD0, 0x05, 0xD8, 0x0D, 0xDC, - 0x1D, 0xDE, 0x3D, 0xDF, 0x7D, 0xDE, 0x3D, 0xDC, 0x1D, 0xD8, 0x0D, - 0xD0, 0x05, 0xC0, 0x01, 0xC0, 0x01, 0xC0, 0x01, 0x00, 0x00}; + static char hsplit_smsk[] = { + 0xC0, 0x01, 0xC0, 0x01, 0xC0, 0x01, 0xD0, 0x05, 0xD8, 0x0D, 0xDC, + 0x1D, 0xDE, 0x3D, 0xDF, 0x7D, 0xDE, 0x3D, 0xDC, 0x1D, 0xD8, 0x0D, + 0xD0, 0x05, 0xC0, 0x01, 0xC0, 0x01, 0xC0, 0x01, 0x00, 0x00, + }; static char hsplit_lbm[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x80, 0x01, 0x00, 0x00, 0x80, 0x01, @@ -1163,38 +1171,44 @@ void wm_init_cursor_data(void) 0xC8, 0x03, 0x00, 0x00, 0xC0, 0x03, 0x00, 0x00, 0xC0, 0x03, 0x00, 0x00, 0xC0, 0x03, 0x00, 0x00, 0xC0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00}; - static BCursor HSplitCursor = {/*small*/ - hsplit_sbm, - hsplit_smsk, - 16, - 16, - 7, - 7, - /*big*/ - hsplit_lbm, - hsplit_lmsk, - 32, - 32, - 15, - 15, - /*color*/ - BC_BLACK, - BC_WHITE}; + static BCursor HSplitCursor = { + /*small*/ + hsplit_sbm, + hsplit_smsk, + 16, + 16, + 7, + 7, + /*big*/ + hsplit_lbm, + hsplit_lmsk, + 32, + 32, + 15, + 15, + /*color*/ + BC_BLACK, + BC_WHITE, + }; BlenderCursor[BC_H_SPLITCURSOR] = &HSplitCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Vertical Split Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; - static char vsplit_sbm[] = {0x00, 0x00, 0x80, 0x00, 0xC0, 0x01, 0xE0, 0x03, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0xFE, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xE0, 0x03, 0xC0, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00}; + static char vsplit_sbm[] = { + 0x00, 0x00, 0x80, 0x00, 0xC0, 0x01, 0xE0, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xFE, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xE0, 0x03, 0xC0, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, + }; - static char vsplit_smsk[] = {0x80, 0x00, 0xC0, 0x01, 0xE0, 0x03, 0xF0, 0x07, 0xF8, 0x0F, 0x00, - 0x00, 0xFF, 0x7F, 0xFF, 0x7F, 0xFF, 0x7F, 0x00, 0x00, 0xF8, 0x0F, - 0xF0, 0x07, 0xE0, 0x03, 0xC0, 0x01, 0x80, 0x00, 0x00, 0x00}; + static char vsplit_smsk[] = { + 0x80, 0x00, 0xC0, 0x01, 0xE0, 0x03, 0xF0, 0x07, 0xF8, 0x0F, 0x00, + 0x00, 0xFF, 0x7F, 0xFF, 0x7F, 0xFF, 0x7F, 0x00, 0x00, 0xF8, 0x0F, + 0xF0, 0x07, 0xE0, 0x03, 0xC0, 0x01, 0x80, 0x00, 0x00, 0x00, + }; static char vsplit_lbm[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, @@ -1218,38 +1232,44 @@ void wm_init_cursor_data(void) 0xF8, 0x0F, 0x00, 0x00, 0xF0, 0x07, 0x00, 0x00, 0xE0, 0x03, 0x00, 0x00, 0xC0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - static BCursor VSplitCursor = {/*small*/ - vsplit_sbm, - vsplit_smsk, - 16, - 16, - 7, - 7, - /*big*/ - vsplit_lbm, - vsplit_lmsk, - 32, - 32, - 15, - 15, - /*color*/ - BC_BLACK, - BC_WHITE}; + static BCursor VSplitCursor = { + /*small*/ + vsplit_sbm, + vsplit_smsk, + 16, + 16, + 7, + 7, + /*big*/ + vsplit_lbm, + vsplit_lmsk, + 32, + 32, + 15, + 15, + /*color*/ + BC_BLACK, + BC_WHITE, + }; BlenderCursor[BC_V_SPLITCURSOR] = &VSplitCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** North Arrow Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; - static char narrow_sbm[] = {0x00, 0x00, 0x80, 0x00, 0xC0, 0x01, 0xE0, 0x03, 0xF0, 0x07, 0xF8, - 0x0F, 0xFC, 0x1F, 0xE0, 0x03, 0xE0, 0x03, 0xE0, 0x03, 0xE0, 0x03, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + static char narrow_sbm[] = { + 0x00, 0x00, 0x80, 0x00, 0xC0, 0x01, 0xE0, 0x03, 0xF0, 0x07, 0xF8, + 0x0F, 0xFC, 0x1F, 0xE0, 0x03, 0xE0, 0x03, 0xE0, 0x03, 0xE0, 0x03, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; - static char narrow_smsk[] = {0x80, 0x00, 0xC0, 0x01, 0xE0, 0x03, 0xF0, 0x07, 0xF8, 0x0F, 0xFC, - 0x1F, 0xFE, 0x3F, 0xFF, 0x7F, 0xF0, 0x07, 0xF0, 0x07, 0xF0, 0x07, - 0xF0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + static char narrow_smsk[] = { + 0x80, 0x00, 0xC0, 0x01, 0xE0, 0x03, 0xF0, 0x07, 0xF8, 0x0F, 0xFC, + 0x1F, 0xFE, 0x3F, 0xFF, 0x7F, 0xF0, 0x07, 0xF0, 0x07, 0xF0, 0x07, + 0xF0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; static char narrow_lbm[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0xC0, 0x01, @@ -1273,38 +1293,44 @@ void wm_init_cursor_data(void) 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - static BCursor NArrowCursor = {/*small*/ - narrow_sbm, - narrow_smsk, - 16, - 16, - 7, - 4, - /*big*/ - narrow_lbm, - narrow_lmsk, - 32, - 32, - 15, - 10, - /*color*/ - BC_BLACK, - BC_WHITE}; + static BCursor NArrowCursor = { + /*small*/ + narrow_sbm, + narrow_smsk, + 16, + 16, + 7, + 4, + /*big*/ + narrow_lbm, + narrow_lmsk, + 32, + 32, + 15, + 10, + /*color*/ + BC_BLACK, + BC_WHITE, + }; BlenderCursor[BC_N_ARROWCURSOR] = &NArrowCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** South Arrow Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; - static char sarrow_sbm[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, - 0x03, 0xE0, 0x03, 0xE0, 0x03, 0xE0, 0x03, 0xFC, 0x1F, 0xF8, 0x0F, - 0xF0, 0x07, 0xE0, 0x03, 0xC0, 0x01, 0x80, 0x00, 0x00, 0x00}; + static char sarrow_sbm[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, + 0x03, 0xE0, 0x03, 0xE0, 0x03, 0xE0, 0x03, 0xFC, 0x1F, 0xF8, 0x0F, + 0xF0, 0x07, 0xE0, 0x03, 0xC0, 0x01, 0x80, 0x00, 0x00, 0x00, + }; - static char sarrow_smsk[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x07, 0xF0, - 0x07, 0xF0, 0x07, 0xF0, 0x07, 0xFF, 0x7F, 0xFE, 0x3F, 0xFC, 0x1F, - 0xF8, 0x0F, 0xF0, 0x07, 0xE0, 0x03, 0xC0, 0x01, 0x80, 0x00}; + static char sarrow_smsk[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x07, 0xF0, + 0x07, 0xF0, 0x07, 0xF0, 0x07, 0xFF, 0x7F, 0xFE, 0x3F, 0xFC, 0x1F, + 0xF8, 0x0F, 0xF0, 0x07, 0xE0, 0x03, 0xC0, 0x01, 0x80, 0x00, + }; static char sarrow_lbm[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, @@ -1328,38 +1354,44 @@ void wm_init_cursor_data(void) 0xFC, 0x1F, 0x00, 0x00, 0xF8, 0x0F, 0x00, 0x00, 0xF0, 0x07, 0x00, 0x00, 0xE0, 0x03, 0x00, 0x00, 0xC0, 0x01, 0x00, 0x00, 0x80, 0x00, 0x00}; - static BCursor SArrowCursor = {/*small*/ - sarrow_sbm, - sarrow_smsk, - 16, - 16, - 7, - 11, - /*big*/ - sarrow_lbm, - sarrow_lmsk, - 32, - 32, - 15, - 21, - /*color*/ - BC_BLACK, - BC_WHITE}; + static BCursor SArrowCursor = { + /*small*/ + sarrow_sbm, + sarrow_smsk, + 16, + 16, + 7, + 11, + /*big*/ + sarrow_lbm, + sarrow_lmsk, + 32, + 32, + 15, + 21, + /*color*/ + BC_BLACK, + BC_WHITE, + }; BlenderCursor[BC_S_ARROWCURSOR] = &SArrowCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** East Arrow Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; - static char earrow_sbm[] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x0E, 0xE0, - 0x1F, 0xE0, 0x3F, 0xE0, 0x7F, 0xE0, 0x3F, 0xE0, 0x1F, 0x00, 0x0E, - 0x00, 0x06, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + static char earrow_sbm[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x06, 0x00, 0x0E, 0xE0, + 0x1F, 0xE0, 0x3F, 0xE0, 0x7F, 0xE0, 0x3F, 0xE0, 0x1F, 0x00, 0x0E, + 0x00, 0x06, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; - static char earrow_smsk[] = {0x00, 0x01, 0x00, 0x03, 0x00, 0x07, 0x00, 0x0F, 0xF0, 0x1F, 0xF0, - 0x3F, 0xF0, 0x7F, 0xF0, 0xFF, 0xF0, 0x7F, 0xF0, 0x3F, 0xF0, 0x1F, - 0x00, 0x0F, 0x00, 0x07, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00}; + static char earrow_smsk[] = { + 0x00, 0x01, 0x00, 0x03, 0x00, 0x07, 0x00, 0x0F, 0xF0, 0x1F, 0xF0, + 0x3F, 0xF0, 0x7F, 0xF0, 0xFF, 0xF0, 0x7F, 0xF0, 0x3F, 0xF0, 0x1F, + 0x00, 0x0F, 0x00, 0x07, 0x00, 0x03, 0x00, 0x01, 0x00, 0x00, + }; static char earrow_lbm[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, @@ -1383,38 +1415,44 @@ void wm_init_cursor_data(void) 0x00, 0x1F, 0x00, 0x00, 0x00, 0x0F, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00}; - static BCursor EArrowCursor = {/*small*/ - earrow_sbm, - earrow_smsk, - 16, - 16, - 11, - 7, - /*big*/ - earrow_lbm, - earrow_lmsk, - 32, - 32, - 15, - 22, - /*color*/ - BC_BLACK, - BC_WHITE}; + static BCursor EArrowCursor = { + /*small*/ + earrow_sbm, + earrow_smsk, + 16, + 16, + 11, + 7, + /*big*/ + earrow_lbm, + earrow_lmsk, + 32, + 32, + 15, + 22, + /*color*/ + BC_BLACK, + BC_WHITE, + }; BlenderCursor[BC_E_ARROWCURSOR] = &EArrowCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** West Arrow Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; - static char warrow_sbm[] = {0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x60, 0x00, 0x70, 0x00, 0xF8, - 0x07, 0xFC, 0x07, 0xFE, 0x07, 0xFC, 0x07, 0xF8, 0x07, 0x70, 0x00, - 0x60, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + static char warrow_sbm[] = { + 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x60, 0x00, 0x70, 0x00, 0xF8, + 0x07, 0xFC, 0x07, 0xFE, 0x07, 0xFC, 0x07, 0xF8, 0x07, 0x70, 0x00, + 0x60, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; - static char warrow_smsk[] = {0x80, 0x00, 0xC0, 0x00, 0xE0, 0x00, 0xF0, 0x00, 0xF8, 0x0F, 0xFC, - 0x0F, 0xFE, 0x0F, 0xFF, 0x0F, 0xFE, 0x0F, 0xFC, 0x0F, 0xF8, 0x0F, - 0xF0, 0x00, 0xE0, 0x00, 0xC0, 0x00, 0x80, 0x00, 0x00, 0x00}; + static char warrow_smsk[] = { + 0x80, 0x00, 0xC0, 0x00, 0xE0, 0x00, 0xF0, 0x00, 0xF8, 0x0F, 0xFC, + 0x0F, 0xFE, 0x0F, 0xFF, 0x0F, 0xFE, 0x0F, 0xFC, 0x0F, 0xF8, 0x0F, + 0xF0, 0x00, 0xE0, 0x00, 0xC0, 0x00, 0x80, 0x00, 0x00, 0x00, + }; static char warrow_lbm[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, @@ -1438,38 +1476,44 @@ void wm_init_cursor_data(void) 0xF8, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - static BCursor WArrowCursor = {/*small*/ - warrow_sbm, - warrow_smsk, - 16, - 16, - 4, - 7, - /*big*/ - warrow_lbm, - warrow_lmsk, - 32, - 32, - 15, - 15, - /*color*/ - BC_BLACK, - BC_WHITE}; + static BCursor WArrowCursor = { + /*small*/ + warrow_sbm, + warrow_smsk, + 16, + 16, + 4, + 7, + /*big*/ + warrow_lbm, + warrow_lmsk, + 32, + 32, + 15, + 15, + /*color*/ + BC_BLACK, + BC_WHITE, + }; BlenderCursor[BC_W_ARROWCURSOR] = &WArrowCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Stop Sign Cursor ***********************/ - BEGIN_CURSOR_BLOCK + BEGIN_CURSOR_BLOCK; - static char stop_sbm[] = {0x00, 0x00, 0xE0, 0x07, 0x38, 0x1C, 0x1C, 0x30, 0x3C, 0x20, 0x76, - 0x60, 0xE2, 0x40, 0xC2, 0x41, 0x82, 0x43, 0x02, 0x47, 0x06, 0x6E, - 0x04, 0x3C, 0x0C, 0x38, 0x38, 0x1C, 0xE0, 0x07, 0x00, 0x00}; + static char stop_sbm[] = { + 0x00, 0x00, 0xE0, 0x07, 0x38, 0x1C, 0x1C, 0x30, 0x3C, 0x20, 0x76, + 0x60, 0xE2, 0x40, 0xC2, 0x41, 0x82, 0x43, 0x02, 0x47, 0x06, 0x6E, + 0x04, 0x3C, 0x0C, 0x38, 0x38, 0x1C, 0xE0, 0x07, 0x00, 0x00, + }; - static char stop_smsk[] = {0xE0, 0x07, 0xF8, 0x1F, 0xFC, 0x3F, 0x3E, 0x7C, 0x7E, 0x70, 0xFF, - 0xF0, 0xF7, 0xE1, 0xE7, 0xE3, 0xC7, 0xE7, 0x87, 0xEF, 0x0F, 0xFF, - 0x0E, 0x7E, 0x3E, 0x7C, 0xFC, 0x3F, 0xF8, 0x1F, 0xE0, 0x07}; + static char stop_smsk[] = { + 0xE0, 0x07, 0xF8, 0x1F, 0xFC, 0x3F, 0x3E, 0x7C, 0x7E, 0x70, 0xFF, + 0xF0, 0xF7, 0xE1, 0xE7, 0xE3, 0xC7, 0xE7, 0x87, 0xEF, 0x0F, 0xFF, + 0x0E, 0x7E, 0x3E, 0x7C, 0xFC, 0x3F, 0xF8, 0x1F, 0xE0, 0x07, + }; static char stop_lbm[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x0F, 0x00, 0x00, 0xFE, 0x7F, 0x00, 0x00, 0x0F, 0xF0, @@ -1493,27 +1537,29 @@ void wm_init_cursor_data(void) 0x03, 0xC0, 0x0F, 0xE0, 0x1F, 0xF8, 0x07, 0xC0, 0xFF, 0xFF, 0x03, 0x80, 0xFF, 0xFF, 0x01, 0x00, 0xFE, 0x7F, 0x00, 0x00, 0xF0, 0x0F, 0x00}; - static BCursor StopCursor = {/*small*/ - stop_sbm, - stop_smsk, - 16, - 16, - 7, - 7, - /*big*/ - stop_lbm, - stop_lmsk, - 32, - 32, - 15, - 15, - /*color*/ - BC_BLACK, - BC_WHITE}; + static BCursor StopCursor = { + /*small*/ + stop_sbm, + stop_smsk, + 16, + 16, + 7, + 7, + /*big*/ + stop_lbm, + stop_lmsk, + 32, + 32, + 15, + 15, + /*color*/ + BC_BLACK, + BC_WHITE, + }; BlenderCursor[BC_STOPCURSOR] = &StopCursor; - END_CURSOR_BLOCK + END_CURSOR_BLOCK; /********************** Put the cursors in the array ***********************/ } diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 701aae20cd3..20f6162f9d4 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -3343,14 +3343,16 @@ static const EnumPropertyItem preview_id_type_items[] = { static int previews_clear_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); - ListBase *lb[] = {&bmain->objects, - &bmain->collections, - &bmain->materials, - &bmain->worlds, - &bmain->lights, - &bmain->textures, - &bmain->images, - NULL}; + ListBase *lb[] = { + &bmain->objects, + &bmain->collections, + &bmain->materials, + &bmain->worlds, + &bmain->lights, + &bmain->textures, + &bmain->images, + NULL, + }; int i; const int id_filters = RNA_enum_get(op->ptr, "id_type"); |