Cleanup: code style & cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1325ab7124b66db9676589a2e7eeb2aafa849e93..3a91e1b655a00771919433df32ffcd77d7cee666 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -927,7 +927,7 @@ if(WITH_X11)
        if(WITH_X11_ALPHA)
                find_library(X11_Xrender_LIB Xrender  ${X11_LIB_SEARCH_PATH})
                mark_as_advanced(X11_Xrender_LIB)
-               if (X11_Xrender_LIB)
+               if(X11_Xrender_LIB)
                        list(APPEND PLATFORM_LINKLIBS ${X11_Xrender_LIB})
                else()
                        set(WITH_X11_ALPHA OFF)

diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake
index 1f0a283ba0e0d1e91661c88ee5b3234671b846a4..a43b99f5d1e5733c9c47dfd30408cb6c6775f19f 100644 (file)
--- a/build_files/cmake/buildinfo.cmake
+++ b/build_files/cmake/buildinfo.cmake
@@ -56,7 +56,7 @@ if(EXISTS ${SOURCE_DIR}/.git)
                                string(REGEX REPLACE "[\r\n]+" ";" _git_contains_branches "${_git_contains_branches}")
                                string(REGEX REPLACE ";[ \t]+" ";" _git_contains_branches "${_git_contains_branches}")
                                foreach(_branch ${_git_contains_branches})
-                                       if (NOT "${_branch}" MATCHES "\\(HEAD.*")
+                                       if(NOT "${_branch}" MATCHES "\\(HEAD.*")
                                                set(MY_WC_BRANCH "${_branch}")
                                                break()
                                        endif()

diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 09428953a468b8afffb9f61012adb2c1083e8da9..f9992ee92b934617e69b308ca4ab1357f5e6a443 100644 (file)
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1574,24 +1574,24 @@ macro(openmp_delayload
 endmacro()
 
 MACRO(WINDOWS_SIGN_TARGET target)
-       if (WITH_WINDOWS_CODESIGN)
-               if (!SIGNTOOL_EXE)
+       if(WITH_WINDOWS_CODESIGN)
+               if(!SIGNTOOL_EXE)
                        error("Codesigning is enabled, but signtool is not found")
                else()
-                       if (WINDOWS_CODESIGN_PFX_PASSWORD)
+                       if(WINDOWS_CODESIGN_PFX_PASSWORD)
                                set(CODESIGNPASSWORD /p ${WINDOWS_CODESIGN_PFX_PASSWORD})
                        else()
-                               if ($ENV{PFXPASSWORD})
+                               if($ENV{PFXPASSWORD})
                                        set(CODESIGNPASSWORD /p $ENV{PFXPASSWORD})
                                else()
-                                       message( FATAL_ERROR "WITH_WINDOWS_CODESIGN is on but WINDOWS_CODESIGN_PFX_PASSWORD not set, and environment variable PFXPASSWORD not found, unable to sign code.")
+                                       message(FATAL_ERROR "WITH_WINDOWS_CODESIGN is on but WINDOWS_CODESIGN_PFX_PASSWORD not set, and environment variable PFXPASSWORD not found, unable to sign code.")
                                endif()
                        endif()
                        add_custom_command(TARGET ${target}
-                                               POST_BUILD
-                                               COMMAND ${SIGNTOOL_EXE} sign /f ${WINDOWS_CODESIGN_PFX} ${CODESIGNPASSWORD} $<TARGET_FILE:${target}>
-                                               VERBATIM
-                               )
+                               POST_BUILD
+                               COMMAND ${SIGNTOOL_EXE} sign /f ${WINDOWS_CODESIGN_PFX} ${CODESIGNPASSWORD} $<TARGET_FILE:${target}>
+                               VERBATIM
+                       )
                endif()
        endif()
 ENDMACRO()

diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake
index e8621bc457a83e652642b2a880b6fd478312f2e5..5b894d96f95f1ed433212a96a8d9543886e6cbea 100644 (file)
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -40,8 +40,8 @@ unset(MY_WC_HASH)
 # Force Package Name
 execute_process(COMMAND date "+%Y%m%d" OUTPUT_VARIABLE CPACK_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
 string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
-if (MSVC)
-       if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+if(MSVC)
+       if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
                set(PACKAGE_ARCH windows64)
        else()
                set(PACKAGE_ARCH windows32)
@@ -50,7 +50,7 @@ else(MSVC)
        set(PACKAGE_ARCH ${CMAKE_SYSTEM_PROCESSOR})
 endif()
 
-if (CPACK_OVERRIDE_PACKAGENAME)
+if(CPACK_OVERRIDE_PACKAGENAME)
        set(CPACK_PACKAGE_FILE_NAME ${CPACK_OVERRIDE_PACKAGENAME}-${PACKAGE_ARCH})
 else()
        set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME_LOWER}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-git${CPACK_DATE}.${BUILD_REV}-${PACKAGE_ARCH})

diff --git a/build_files/cmake/platform/platform_win32_msvc.cmake b/build_files/cmake/platform/platform_win32_msvc.cmake
index 45a44596e614d46ab105860ad1f63e3fa0cde319..3ea93a962901d345de3e3d3f366945b6e739f9fc 100644 (file)
--- a/build_files/cmake/platform/platform_win32_msvc.cmake
+++ b/build_files/cmake/platform/platform_win32_msvc.cmake
@@ -33,7 +33,7 @@ endmacro()
 macro(windows_find_package package_name
        )
        if(WITH_WINDOWS_FIND_MODULES)
-               find_package( ${package_name})
+               find_package(${package_name})
        endif(WITH_WINDOWS_FIND_MODULES)
 endmacro()
 

diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt
index dd9889c81ba1890156667419bbf9d32baae4ddd5..bfe230250ae7db42cc40cb5188f0a3d597b4ca24 100644 (file)
--- a/intern/CMakeLists.txt
+++ b/intern/CMakeLists.txt
@@ -34,7 +34,7 @@ add_subdirectory(mikktspace)
 add_subdirectory(glew-mx)
 add_subdirectory(eigen)
 
-if (WITH_GAMEENGINE_DECKLINK)
+if(WITH_GAMEENGINE_DECKLINK)
        add_subdirectory(decklink)
 endif()
 

diff --git a/intern/decklink/CMakeLists.txt b/intern/decklink/CMakeLists.txt
index fbef65cdba479bc5f8cba41ca6960c0d4824b71c..b7727cbc32afc891523fa221b3d4b7803eb12e7c 100644 (file)
--- a/intern/decklink/CMakeLists.txt
+++ b/intern/decklink/CMakeLists.txt
@@ -34,14 +34,14 @@ set(SRC
        DeckLinkAPI.h
 )
 
-if (WIN32)
+if(WIN32)
        list(APPEND SRC
                win/DeckLinkAPI_h.h
                win/DeckLinkAPI_i.c
        )
 endif()
 
-if (UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE)
        list(APPEND SRC
                linux/DeckLinkAPI.h
                linux/DeckLinkAPIConfiguration.h

diff --git a/source/blender/blenkernel/BKE_cachefile.h b/source/blender/blenkernel/BKE_cachefile.h
index 7e1c069df9a9ac4d5eb9700c81d7479575a2c9c8..0d4ed2083b1f0051a2c26fbb9bec27542e107db8 100644 (file)
--- a/source/blender/blenkernel/BKE_cachefile.h
+++ b/source/blender/blenkernel/BKE_cachefile.h
@@ -55,7 +55,7 @@ void BKE_cachefile_reload(const struct Main *bmain, struct CacheFile *cache_file
 
 void BKE_cachefile_ensure_handle(const struct Main *bmain, struct CacheFile *cache_file);
 
-void BKE_cachefile_update_frame(struct Main *bmain, struct Scene *scene,const float ctime, const float fps);
+void BKE_cachefile_update_frame(struct Main *bmain, struct Scene *scene, const float ctime, const float fps);
 
 bool BKE_cachefile_filepath_get(
         const struct Main *bmain, const struct CacheFile *cache_file, float frame,

diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index e5967be0bc7557a5e4dcfda3e40a7db51887cc3d..2b6a84a2f8700339955ddb2c284467df6fa7eb86 100644 (file)
--- a/source/blender/blenkernel/BKE_particle.h
+++ b/source/blender/blenkernel/BKE_particle.h
@@ -207,7 +207,7 @@ typedef struct ParticleCollisionElement {
 typedef struct ParticleCollision {
        struct Object *current;
        struct Object *hit;
-       struct Object *skip[PARTICLE_COLLISION_MAX_COLLISIONS+1];
+       struct Object *skip[PARTICLE_COLLISION_MAX_COLLISIONS + 1];
        struct Object *emitter;
 
        struct CollisionModifierData *md; // collision modifier for current object;

diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index 4f3ffed41bc7a8a2d1aee01df5d87db8f1013e0a..b3a0895d06315f627ee70ddcfe492a89d53ea9cd 100644 (file)
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -508,7 +508,7 @@ static void calchandle_curvemap(
                                if ((bezt->h2 == HD_AUTO_ANIM) && next && prev) { /* keep horizontal if extrema */
                                        const float ydiff1 = prev->vec[1][1] - bezt->vec[1][1];
                                        const float ydiff2 = next->vec[1][1] - bezt->vec[1][1];
-                                       if ((ydiff1 <= 0.0f && ydiff2 <= 0.0f)||
+                                       if ((ydiff1 <= 0.0f && ydiff2 <= 0.0f) ||
                                            (ydiff1 >= 0.0f && ydiff2 >= 0.0f))
                                        {
                                                bezt->vec[2][1] = bezt->vec[1][1];

diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index dc9f3b57f1f1cfcb734860e1aebce18444dc0dfe..c525e75b825e7ba597edf92269f73d5ae8e13e5b 100644 (file)
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -2460,8 +2460,7 @@ static void dynamic_paint_find_island_border(
                        const unsigned int *other_loop_idx = mlooptri[lt_index].tri;
 
                        /* Check edges for match, looping in the same order as the outer loop. */
-                       for (int j = 0; j < 3; j++)
-                       {
+                       for (int j = 0; j < 3; j++) {
                                const int overt0 = mloop[other_loop_idx[(j + 0)]].v;
                                const int overt1 = mloop[other_loop_idx[(j + 1) % 3]].v;
 
@@ -2525,8 +2524,7 @@ static void dynamic_paint_find_island_border(
                int final_pixel[2] = { (int)floorf(tgt_pixel[0] * w), (int)floorf(tgt_pixel[1] * h) };
 
                /* If current pixel uv is outside of texture    */
-               if (final_pixel[0] < 0 || final_pixel[0] >= w || final_pixel[1] < 0 || final_pixel[1] >= h)
-               {
+               if (final_pixel[0] < 0 || final_pixel[0] >= w || final_pixel[1] < 0 || final_pixel[1] >= h) {
                        if (bdata->best_index == NOT_FOUND)
                                bdata->best_index = OUT_OF_TEXTURE;
 

diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c
index e7c0e69b1cbbeaa5cd3cb402ca19d1863e272cbf..2fffa0dea28626914d15055ba2479dc9fe7a22c7 100644 (file)
--- a/source/blender/blenkernel/intern/editderivedmesh.c
+++ b/source/blender/blenkernel/intern/editderivedmesh.c
@@ -642,10 +642,10 @@ static void emDM_recalcLoopTri(DerivedMesh *dm)
                MLoopTri *lt = &mlooptri[i];
 
                ARRAY_SET_ITEMS(
-                               lt->tri,
-                               BM_elem_index_get(ltri[0]),
-                               BM_elem_index_get(ltri[1]),
-                               BM_elem_index_get(ltri[2]));
+                       lt->tri,
+                       BM_elem_index_get(ltri[0]),
+                       BM_elem_index_get(ltri[1]),
+                       BM_elem_index_get(ltri[2]));
                lt->poly = BM_elem_index_get(ltri[0]->f);
        }
 }

diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index 2ab6158c98e64149aacc4595edde5617ffa7ea8d..7dbc43e0a327016807728c2a80a32f17c78215f8 100644 (file)
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -1217,6 +1217,7 @@ bool driver_get_variable_property(
        return true;
 }
 
+#if 0
 /* Helper function to obtain a pointer to a Pose Channel (for evaluating drivers) */
 static bPoseChannel *dtar_get_pchan_ptr(ChannelDriver *driver, DriverTarget *dtar)
 {
@@ -1239,6 +1240,7 @@ static bPoseChannel *dtar_get_pchan_ptr(ChannelDriver *driver, DriverTarget *dta
                return NULL;
        }
 }
+#endif
 
 static short driver_check_valid_targets(ChannelDriver *driver, DriverVar *dvar)
 {

diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 6b4b492b212e84f37d90331f3e96fad4c8fc64fc..e380b5c17e0dabcc71933e2093e79bd595779eb6 100644 (file)
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1863,7 +1863,7 @@ void BKE_library_make_local(
                                /* Special case for objects because we don't want proxy pointers to be
                                 * cleared yet. This will happen down the road in this function.
                                 */
-                               BKE_object_make_local_ex(bmain, (Object*)id, true, false);
+                               BKE_object_make_local_ex(bmain, (Object *)id, true, false);
                        }
                        else {
                                id_make_local(bmain, id, false, true);

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 6a491ba5ec496f198fcb529da956627517aefa3b..2de7cd499014ab971624ea747a95840fec6d77ed 100644 (file)
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -514,7 +514,7 @@ void BKE_sequencer_imbuf_to_sequencer_space(Scene *scene, ImBuf *ibuf, bool make
                         * artifacts which will then not happen in final render.
                         */
                        IMB_colormanagement_transform_byte_threaded(
-                               (unsigned char*)ibuf->rect, ibuf->x, ibuf->y, ibuf->channels,
+                               (unsigned char *)ibuf->rect, ibuf->x, ibuf->y, ibuf->channels,
                                from_colorspace, to_colorspace);
                }
                else {
@@ -523,7 +523,7 @@ void BKE_sequencer_imbuf_to_sequencer_space(Scene *scene, ImBuf *ibuf, bool make
                         */
                        imb_addrectfloatImBuf(ibuf);
                        IMB_colormanagement_transform_from_byte_threaded(
-                               ibuf->rect_float, (unsigned char*)ibuf->rect,
+                               ibuf->rect_float, (unsigned char *)ibuf->rect,
                                ibuf->x, ibuf->y, ibuf->channels,
                                from_colorspace, to_colorspace);
                        /* We don't need byte buffer anymore. */

diff --git a/source/blender/blenlib/intern/task.c b/source/blender/blenlib/intern/task.c
index 49d2ee83a66c38f627f8ef55a3d26b8815b38ed6..17e20f8fa186efb16801649b0abb2dffd1e1715e 100644 (file)
--- a/source/blender/blenlib/intern/task.c
+++ b/source/blender/blenlib/intern/task.c
@@ -734,7 +734,7 @@ void BLI_task_pool_work_and_wait(TaskPool *pool)
        TaskThreadLocalStorage *tls = get_task_tls(pool, pool->thread_id);
        TaskScheduler *scheduler = pool->scheduler;
 
-       if (atomic_fetch_and_and_uint8((uint8_t*)&pool->is_suspended, 0)) {
+       if (atomic_fetch_and_and_uint8((uint8_t *)&pool->is_suspended, 0)) {
                if (pool->num_suspended) {
                        task_pool_num_increase(pool, pool->num_suspended);
                        BLI_mutex_lock(&scheduler->queue_mutex);
@@ -869,7 +869,7 @@ BLI_INLINE bool parallel_range_next_iter_get(
         int * __restrict iter, int * __restrict count)
 {
        uint32_t uval = atomic_fetch_and_add_uint32((uint32_t *)(&state->iter), state->chunk_size);
-       int previter = *(int32_t*)&uval;
+       int previter = *(int32_t *)&uval;
 
        *iter = previter;
        *count = max_ii(0, min_ii(state->chunk_size, state->stop - previter));

diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 4d4f8c1298a107eb9b25e02acc904d219a76e07d..5852ee72b198938485a45867aac27d92578484ae 100644 (file)
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -2775,7 +2775,7 @@ static bAnimChannelType ACF_DSMCLIP =
        acf_generic_indention_1,         /* indent level */
        acf_generic_basic_offset,        /* offset */
 
-       acf_generic_idblock_name ,       /* name */
+       acf_generic_idblock_name,        /* name */
        acf_generic_idfill_name_prop,    /* name prop */
        acf_dsmclip_icon,                /* icon */
 

diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c
index 5154a77ad217e43e5052769158805e229722d1ba..f3859154dfb1f5adc205c3a3bf52cfbd935b38ac 100644 (file)
--- a/source/blender/editors/interface/interface_eyedropper.c
+++ b/source/blender/editors/interface/interface_eyedropper.c
@@ -1082,7 +1082,7 @@ static int depthdropper_poll(bContext *C)
                        return 1;
                }
        }
-       else  {
+       else {
                RegionView3D *rv3d = CTX_wm_region_view3d(C);
                if (rv3d && rv3d->persp == RV3D_CAMOB) {
                        View3D *v3d = CTX_wm_view3d(C);

diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index ce1153911dabdc2a45a60e34dea2ff229ee8c8c3..f6347388cc40a90b255d8ed3d2abe760c79db7bf 100644 (file)
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -2238,8 +2238,9 @@ static void ui_litem_layout_row(uiLayout *litem)
        /* add extra pixel */
        uiItem *last_item = litem->items.last;
        extra_pixel = litem->w - (x - litem->x);
-       if (extra_pixel > 0 && litem->alignment == UI_LAYOUT_ALIGN_EXPAND && 
-                       last_free_item && last_item && last_item->flag & UI_ITEM_FIXED) {
+       if (extra_pixel > 0 && litem->alignment == UI_LAYOUT_ALIGN_EXPAND &&
+           last_free_item && last_item && last_item->flag & UI_ITEM_FIXED)
+       {
                ui_item_move(last_free_item, 0, extra_pixel);
                for (item = last_free_item->next; item; item = item->next)
                        ui_item_move(item, extra_pixel, extra_pixel);

diff --git a/source/blender/editors/io/io_alembic.c b/source/blender/editors/io/io_alembic.c
index a991f59e8e26831c31c4cdc92a64d806cd14224a..3f9eb33e239ed94ce295afdbcb4d1e1326c7448c 100644 (file)
--- a/source/blender/editors/io/io_alembic.c
+++ b/source/blender/editors/io/io_alembic.c
@@ -124,9 +124,9 @@ static int wm_alembic_export_exec(bContext *C, wmOperator *op)
            .use_subdiv_schema = RNA_boolean_get(op->ptr, "subdiv_schema"),
            .compression_type = RNA_enum_get(op->ptr, "compression_type"),
            .packuv = RNA_boolean_get(op->ptr, "packuv"),
-               .triangulate = RNA_boolean_get(op->ptr, "triangulate"),
-               .quad_method = RNA_enum_get(op->ptr, "quad_method"),
-               .ngon_method = RNA_enum_get(op->ptr, "ngon_method"),
+           .triangulate = RNA_boolean_get(op->ptr, "triangulate"),
+           .quad_method = RNA_enum_get(op->ptr, "quad_method"),
+           .ngon_method = RNA_enum_get(op->ptr, "ngon_method"),
 
            .global_scale = RNA_float_get(op->ptr, "global_scale"),
        };

diff --git a/source/blender/editors/space_view3d/drawvolume.c b/source/blender/editors/space_view3d/drawvolume.c
index 182dc214f8e862010718b0403c3a3667e1e59b97..c076bfb4aa4d822acc185c755c4b16344504f619 100644 (file)
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@ -737,7 +737,7 @@ static void add_streamline(float (*verts)[3], float(*colors)[3], float center[3]
        copy_v3_v3(verts[(*offset)++], center);
 }
 
-typedef void (*vector_draw_func)(float(*)[3], float(*)[3], float*, float*, float, float, int*);
+typedef void (*vector_draw_func)(float(*)[3], float(*)[3], float *, float *, float, float, int *);
 #endif  /* WITH_SMOKE */
 
 void draw_smoke_velocity(SmokeDomainSettings *domain, float viewnormal[3])

diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index cf16bb8817d34ee30ad0af24522a175b7bcd6179..3c9becc60dcd59174c1c00777a73655d0f10da85 100644 (file)
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -936,9 +936,10 @@ static bool snapEmpty(
                        float tmp_co[3];
                        copy_v3_v3(tmp_co, obmat[3]);
                        if (test_projected_vert_dist(
-                                       snapdata->depth_range, snapdata->mval, tmp_co,
-                                       snapdata->pmat, snapdata->win_half, is_persp, &dist_px_sq,
-                                       r_loc)) {
+                               snapdata->depth_range, snapdata->mval, tmp_co,
+                               snapdata->pmat, snapdata->win_half, is_persp, &dist_px_sq,
+                               r_loc))
+                       {
                                *dist_px = sqrtf(dist_px_sq);
                                *ray_depth = depth_get(r_loc, snapdata->ray_start, snapdata->ray_dir);
                                retval = true;
@@ -1119,8 +1120,8 @@ static bool snapDerivedMesh(
                /* In vertex and edges you need to get the pixel distance from ray to BoundBox, see: T46099, T46816 */
                if (ELEM(snapdata->snap_to, SCE_SNAP_MODE_VERTEX, SCE_SNAP_MODE_EDGE)) {
                        float dist_px_sq = dist_squared_to_projected_aabb_simple(
-                                   lpmat, snapdata->win_half, ray_min_dist, snapdata->mval,
-                                   ray_org_local, ray_normal_local, bb->vec[0], bb->vec[6]);
+                               lpmat, snapdata->win_half, ray_min_dist, snapdata->mval,
+                               ray_org_local, ray_normal_local, bb->vec[0], bb->vec[6]);
                        if (dist_px_sq > SQUARE(*dist_px))
                        {
                                return retval;
@@ -2078,10 +2079,10 @@ static bool transform_snap_context_project_view3d_mixed_impl(
                for (int i = 0; i < 3; i++) {
                        if (snap_to_flag & (1 << i)) {
                                if (ED_transform_snap_object_project_view3d(
-                                       sctx,
-                                       elem_type[i], params,
-                                       mval, dist_px, &ray_depth,
-                                       r_co, r_no))
+                                       sctx,
+                                       elem_type[i], params,
+                                       mval, dist_px, &ray_depth,
+                                       r_co, r_no))
                                {
                                        is_hit = true;
                                        break;

diff --git a/source/blender/gpu/intern/gpu_debug.c b/source/blender/gpu/intern/gpu_debug.c
index d632e767ca955c464a5310989e1bfffb3b052ba2..ba68d1a6a0fcdce5b0bf144faea364b50fb9f55c 100644 (file)
--- a/source/blender/gpu/intern/gpu_debug.c
+++ b/source/blender/gpu/intern/gpu_debug.c
@@ -161,7 +161,7 @@ const char *gpuErrorString(GLenum err)
 #endif
 
 
-static const char* source_name(GLenum source)
+static const char *source_name(GLenum source)
 {
        switch (source) {
                case GL_DEBUG_SOURCE_API: return "API";
@@ -174,7 +174,7 @@ static const char* source_name(GLenum source)
        }
 }
 
-static const char* message_type_name(GLenum message)
+static const char *message_type_name(GLenum message)
 {
        switch (message) {
                case GL_DEBUG_TYPE_ERROR: return "error";
@@ -188,7 +188,7 @@ static const char* message_type_name(GLenum message)
        }
 }
 
-static const char* category_name_amd(GLenum category)
+static const char *category_name_amd(GLenum category)
 {
        switch (category) {
                case GL_DEBUG_CATEGORY_API_ERROR_AMD: return "API error";

diff --git a/source/blender/gpu/intern/gpu_select_private.h b/source/blender/gpu/intern/gpu_select_private.h
index 631b8806af9119477c282f3f015c404fdbc0f204..8935bd7b25326b5799f09185f5a90e1e31a7246b 100644 (file)
--- a/source/blender/gpu/intern/gpu_select_private.h
+++ b/source/blender/gpu/intern/gpu_select_private.h
@@ -29,6 +29,9 @@
  * Selection implementations.
  */
 
+#ifndef __GPU_SELECT_PRIVATE_H__
+#define __GPU_SELECT_PRIVATE_H__
+
 /* gpu_select_pick */
 void gpu_select_pick_begin(unsigned int (*buffer)[4], unsigned int bufsize, const rcti *input, char mode);
 bool gpu_select_pick_load_id(unsigned int id);
@@ -46,3 +49,5 @@ unsigned int gpu_select_query_end(void);
 
 
 #define SELECT_ID_NONE ((unsigned int)0xffffffff)
+
+#endif  /* __GPU_SELECT_PRIVATE_H__ */

diff --git a/source/blender/gpu/intern/gpu_select_sample_query.c b/source/blender/gpu/intern/gpu_select_sample_query.c
index 5576367edd9b4ad10c371b03cd68130bb37eff22..ba5fefc52277cfcb8ad3e1dd90522401b4cf50d8 100644 (file)
--- a/source/blender/gpu/intern/gpu_select_sample_query.c
+++ b/source/blender/gpu/intern/gpu_select_sample_query.c
@@ -23,7 +23,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/gpu/intern/gpu_select.c
+/** \file blender/gpu/intern/gpu_select_sample_query.c
  *  \ingroup gpu
  *
  * Interface for accessing gpu-related methods for selection. The semantics will be

diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index fe781a309a4f6f9c6b99596b82e6a61825e29aa2..bb70f9dccd0fca316719c10c7b30ec9495d76dcb 100644 (file)
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -243,9 +243,9 @@ static void rna_Scene_alembic_export(
            .use_subdiv_schema = use_subdiv_schema,
            .compression_type = compression_type,
            .packuv = packuv,
-               .triangulate = triangulate,
-               .quad_method = quad_method,
-               .ngon_method = ngon_method,
+           .triangulate = triangulate,
+           .quad_method = quad_method,
+           .ngon_method = ngon_method,
 
            .global_scale = scale,
        };