Cleanup: style, duplicate includes
authorCampbell Barton <ideasman42@gmail.com>
Sat, 7 Oct 2017 04:57:14 +0000 (15:57 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 7 Oct 2017 04:57:14 +0000 (15:57 +1100)
73 files changed:
source/blender/blenkernel/BKE_scene.h
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/editmesh_tangent.c
source/blender/blenkernel/intern/layer.c
source/blender/blenkernel/intern/lightprobe.c
source/blender/blenkernel/intern/mesh_tangent.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/workspace.c
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenloader/intern/versioning_280.c
source/blender/depsgraph/intern/builder/deg_builder_nodes_layer.cc
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/depsgraph/intern/builder/deg_builder_relations_layer.cc
source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
source/blender/depsgraph/intern/depsgraph.cc
source/blender/depsgraph/intern/depsgraph_query.cc
source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
source/blender/draw/engines/basic/basic_engine.c
source/blender/draw/engines/eevee/eevee_effects.c
source/blender/draw/engines/eevee/eevee_lightprobes.c
source/blender/draw/engines/eevee/eevee_lights.c
source/blender/draw/engines/eevee/eevee_lut.h
source/blender/draw/engines/eevee/eevee_materials.c
source/blender/draw/engines/eevee/eevee_private.h
source/blender/draw/engines/external/external_engine.c
source/blender/draw/intern/draw_cache.c
source/blender/draw/intern/draw_cache_impl_mesh.c
source/blender/draw/intern/draw_manager.c
source/blender/draw/intern/draw_manager_profiling.c
source/blender/draw/modes/object_mode.c
source/blender/editors/armature/editarmature_sketch.c
source/blender/editors/interface/interface_draw.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/view2d.c
source/blender/editors/manipulator_library/manipulator_types/dial3d_manipulator.c
source/blender/editors/mask/mask_draw.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/object/object_facemap_ops.c
source/blender/editors/object/object_select.c
source/blender/editors/space_clip/clip_dopesheet_draw.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_time/space_time.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_draw_legacy.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_manipulator.c
source/blender/editors/uvedit/uvedit_smart_stitch.c
source/blender/gpu/GPU_batch.h
source/blender/gpu/intern/gpu_compositing.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_framebuffer.c
source/blender/gpu/intern/gpu_lamp.c
source/blender/gpu/intern/gpu_matrix.c
source/blender/gpu/intern/gpu_shader.c
source/blender/gpu/intern/gpu_uniformbuffer.c
source/blender/gpu/intern/gpu_viewport.c
source/blender/makesrna/intern/rna_depsgraph.c
source/blender/makesrna/intern/rna_lightprobe.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_wm_manipulator.c
source/blender/makesrna/intern/rna_wm_manipulator_api.c
source/blender/python/gawain/gwn_py_api.h
source/blender/python/gawain/gwn_py_types.c
source/blender/windowmanager/intern/wm_stereo.c
source/blender/windowmanager/intern/wm_window.c
source/blender/windowmanager/manipulators/intern/wm_manipulator_target_props.c

index 2c44179c7350edcf7fb92c3938adadd5afa3d904..e517b65cf3e1ea514a9418fc9e471ef9dc78443b 100644 (file)
@@ -188,7 +188,7 @@ void        BKE_scene_multiview_videos_dimensions_get(const struct RenderData *r
 int         BKE_scene_multiview_num_videos_get(const struct RenderData *rd);
 
 /* depsgraph */
-struct DepsgraphBKE_scene_get_depsgraph(struct Scene *scene, struct SceneLayer *scene_layer);
+struct Depsgraph *BKE_scene_get_depsgraph(struct Scene *scene, struct SceneLayer *scene_layer);
 
 #ifdef __cplusplus
 }
index eb35f3daad0654f9db1faf7fb7cb3fb6fbc6d184..3bf5784e6749472917c3c7e2d9c066bac796c119 100644 (file)
@@ -1344,7 +1344,7 @@ const CustomDataMask CD_MASK_BMESH =
     CD_MASK_PROP_STR | CD_MASK_SHAPEKEY | CD_MASK_SHAPE_KEYINDEX | CD_MASK_MDISPS |
     CD_MASK_CREASE | CD_MASK_BWEIGHT | CD_MASK_RECAST | CD_MASK_PAINT_MASK |
     CD_MASK_GRID_PAINT_MASK | CD_MASK_MVERT_SKIN | CD_MASK_FREESTYLE_EDGE | CD_MASK_FREESTYLE_FACE |
-       CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_FACEMAP;
+    CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_FACEMAP;
 /**
  * cover values copied by #BKE_mesh_loops_to_tessdata
  */
index 589c346b2482cc81d36a8829e6ad665dcc42db62..f725a1793b4f42780d560b36f62ddd73cedeae32 100644 (file)
@@ -301,11 +301,14 @@ void BKE_editmesh_loop_tangent_calc(
                &calc_act, &calc_ren, &act_uv_n, &ren_uv_n, act_uv_name, ren_uv_name, &tangent_mask);
 
        if ((tangent_mask_curr | tangent_mask) != tangent_mask_curr) {
-               for (int i = 0; i < tangent_names_len; i++)
-                       if (tangent_names[i][0])
-                               BKE_mesh_add_loop_tangent_named_layer_for_uv(&bm->ldata, loopdata_out, (int)loopdata_out_len, tangent_names[i]);
+               for (int i = 0; i < tangent_names_len; i++) {
+                       if (tangent_names[i][0]) {
+                               BKE_mesh_add_loop_tangent_named_layer_for_uv(
+                                       &bm->ldata, loopdata_out, (int)loopdata_out_len, tangent_names[i]);
+                       }
+               }
                if ((tangent_mask & DM_TANGENT_MASK_ORCO) && CustomData_get_named_layer_index(loopdata_out, CD_TANGENT, "") == -1)
-                                       CustomData_add_layer_named(loopdata_out, CD_TANGENT, CD_CALLOC, NULL, (int)loopdata_out_len, "");
+                       CustomData_add_layer_named(loopdata_out, CD_TANGENT, CD_CALLOC, NULL, (int)loopdata_out_len, "");
                if (calc_act && act_uv_name[0])
                        BKE_mesh_add_loop_tangent_named_layer_for_uv(&bm->ldata, loopdata_out, (int)loopdata_out_len, act_uv_name);
                if (calc_ren && ren_uv_name[0])
index 126a2b7bb6c71d1ea4aeea10f496aab6dc1e16b2..f20b96b8bc781c0e7547297423a3116ef930f198 100644 (file)
@@ -1420,7 +1420,7 @@ void BKE_collection_engine_property_add_float_array(
        val.array.len = array_length;
        val.array.type = IDP_FLOAT;
 
-       IDProperty *idprop= IDP_New(IDP_ARRAY, &val, name);
+       IDProperty *idprop = IDP_New(IDP_ARRAY, &val, name);
        memcpy(IDP_Array(idprop), values, sizeof(float) * idprop->len);
        IDP_AddToGroup(props, idprop);
 }
index 5601fa5ad42244c3f1dc9a69751e5bb1c4a729b7..03bd2344f7b25a573d267b954a1f691e7b05f9a9 100644 (file)
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/blenkernel/intern/probe.c
+/** \file blender/blenkernel/intern/lightprobe.c
  *  \ingroup bke
  */
 
index c1b74b3eb6f589ceb389d7f25bde79adc147b346..77288bd672e576aaa65f6ebecebecd70c74e351f 100644 (file)
@@ -230,8 +230,6 @@ typedef struct {
 } SGLSLMeshToTangent;
 
 /* interface */
-#include "mikktspace.h"
-
 static int dm_ts_GetNumFaces(const SMikkTSpaceContext *pContext)
 {
        SGLSLMeshToTangent *pMesh = pContext->m_pUserData;
index fca0ff92a45f0db2e5149c92442057c978eebc4a..d36f128cef17f2a1708fc241ca90717586ef7c17 100644 (file)
@@ -169,7 +169,8 @@ static void scene_collection_copy(SceneCollection *sc_dst, SceneCollection *sc_s
        BLI_duplicatelist(&sc_dst->scene_collections, &sc_src->scene_collections);
        for (SceneCollection *nsc_src = sc_src->scene_collections.first, *nsc_dst = sc_dst->scene_collections.first;
             nsc_src;
-            nsc_src = nsc_src->next, nsc_dst = nsc_dst->next) {
+            nsc_src = nsc_src->next, nsc_dst = nsc_dst->next)
+       {
                scene_collection_copy(nsc_dst, nsc_src, flag);
        }
 }
@@ -2330,7 +2331,7 @@ int BKE_scene_multiview_num_videos_get(const RenderData *rd)
        }
 }
 
-DepsgraphBKE_scene_get_depsgraph(Scene *scene, SceneLayer *scene_layer)
+Depsgraph *BKE_scene_get_depsgraph(Scene *scene, SceneLayer *scene_layer)
 {
        (void) scene_layer;
        return scene->depsgraph_legacy;
index 65eb08aba27557e51bacb947fb33f4219b4f56d2..05dab9208e5d9c77093b9b84fd209da296402b83 100644 (file)
@@ -117,11 +117,11 @@ static void *workspace_relation_get_data_matching_parent(
  * Hence, this should only be used as assert check before assigining a screen to a workspace.
  */
 #ifndef NDEBUG
-static bool workspaces_is_screen_used(
+static bool workspaces_is_screen_used
 #else
-static bool UNUSED_FUNCTION(workspaces_is_screen_used)(
+static bool UNUSED_FUNCTION(workspaces_is_screen_used)
 #endif
-        const Main *bmain, bScreen *screen)
+        (const Main *bmain, bScreen *screen)
 {
        for (WorkSpace *workspace = bmain->workspaces.first; workspace; workspace = workspace->id.next) {
                if (workspace_layout_find_exec(workspace, screen)) {
index f098449ebd0d13eef00e370b78c3a88dbaee7bcd..a6f8f9a54e962da8be7e1052f088e443b5861061 100644 (file)
@@ -195,7 +195,7 @@ void normalize_m3_m3(float R[3][3], const float A[3][3]) ATTR_NONNULL();
 void normalize_m4_ex(float R[4][4], float r_scale[3]) ATTR_NONNULL();
 void normalize_m4(float R[4][4]) ATTR_NONNULL();
 void normalize_m4_m4_ex(float R[4][4], const float A[4][4], float r_scale[3]) ATTR_NONNULL();
-void normalize_m4_m4(float R[4][4],const float A[4][4]) ATTR_NONNULL();
+void normalize_m4_m4(float R[4][4], const float A[4][4]) ATTR_NONNULL();
 
 void orthogonalize_m3(float R[3][3], int axis);
 void orthogonalize_m4(float R[4][4], int axis);
index bc011824c407c3e71508acb8e355786eda516ff4..ba46c8f81b80112992783e242a1a86a973817efa 100644 (file)
@@ -377,13 +377,13 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
        }
 
        if (!MAIN_VERSION_ATLEAST(main, 280, 1)) {
-               if (!DNA_struct_elem_find(fd->filesdna, "Lamp", "float", "bleedexp"))   {
+               if (!DNA_struct_elem_find(fd->filesdna, "Lamp", "float", "bleedexp")) {
                        for (Lamp *la = main->lamp.first; la; la = la->id.next) {
                                la->bleedexp = 120.0f;
                        }
                }
 
-               if (!DNA_struct_elem_find(fd->filesdna, "GPUDOFSettings", "float", "ratio"))    {
+               if (!DNA_struct_elem_find(fd->filesdna, "GPUDOFSettings", "float", "ratio")) {
                        for (Camera *ca = main->camera.first; ca; ca = ca->id.next) {
                                ca->gpu_dof.ratio = 1.0f;
                        }
@@ -433,7 +433,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
        }
 
        {
-               if (!DNA_struct_elem_find(fd->filesdna, "Lamp", "float", "cascade_max_dist"))   {
+               if (!DNA_struct_elem_find(fd->filesdna, "Lamp", "float", "cascade_max_dist")) {
                        for (Lamp *la = main->lamp.first; la; la = la->id.next) {
                                la->cascade_max_dist = 1000.0f;
                                la->cascade_count = 4;
@@ -442,7 +442,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
                        }
                }
 
-               if (!DNA_struct_elem_find(fd->filesdna, "Lamp", "float", "contact_dist"))       {
+               if (!DNA_struct_elem_find(fd->filesdna, "Lamp", "float", "contact_dist")) {
                        for (Lamp *la = main->lamp.first; la; la = la->id.next) {
                                la->contact_dist = 1.0f;
                                la->contact_bias = 0.03f;
@@ -470,7 +470,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
                        if (ntree->type == NTREE_SHADER) {
                                for (bNode *node = ntree->nodes.first; node; node = node->next) {
                                        if (node->type == 194 /* SH_NODE_EEVEE_METALLIC */ &&
-                                               STREQ(node->idname, "ShaderNodeOutputMetallic"))
+                                           STREQ(node->idname, "ShaderNodeOutputMetallic"))
                                        {
                                                BLI_strncpy(node->idname, "ShaderNodeEeveeMetallic", sizeof(node->idname));
                                                error |= NTREE_DOVERSION_NEED_OUTPUT;
@@ -482,14 +482,14 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main)
                                        }
 
                                        else if (node->type == 196 /* SH_NODE_OUTPUT_EEVEE_MATERIAL */ &&
-                                                        STREQ(node->idname, "ShaderNodeOutputEeveeMaterial"))
+                                                STREQ(node->idname, "ShaderNodeOutputEeveeMaterial"))
                                        {
                                                node->type = SH_NODE_OUTPUT_MATERIAL;
                                                BLI_strncpy(node->idname, "ShaderNodeOutputMaterial", sizeof(node->idname));
                                        }
 
                                        else if (node->type == 194 /* SH_NODE_EEVEE_METALLIC */ &&
-                                                        STREQ(node->idname, "ShaderNodeEeveeMetallic"))
+                                                STREQ(node->idname, "ShaderNodeEeveeMetallic"))
                                        {
                                                node->type = SH_NODE_BSDF_PRINCIPLED;
                                                BLI_strncpy(node->idname, "ShaderNodeBsdfPrincipled", sizeof(node->idname));
index 3ce0947a7b8340de68b8bf4393e3dd65a137427e..b3a88d8ac4d3f9681e936d0c0e1312abc6c3f747 100644 (file)
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
+/** \file blender/depsgraph/intern/builder/deg_builder_nodes_layer.cc
  *  \ingroup depsgraph
  *
  * Methods for constructing depsgraph's nodes
index 6d31ca339882bbce30daddf81e9b71cc86748018..0c5150f2f423b868df9ddfebb6598efd97ab0729 100644 (file)
@@ -1413,7 +1413,8 @@ void DepsgraphRelationBuilder::build_particles(Scene *scene, Object *ob)
                }
                else if ((psys->flag & PSYS_HAIR_DYNAMICS) &&
                         psys->clmd != NULL &&
-                        psys->clmd->coll_parms != NULL) {
+                        psys->clmd->coll_parms != NULL)
+               {
                        add_collision_relations(psys_key,
                                                scene,
                                                ob,
index a6c9fdfc6bc7a271bbce740f6d2c7b7225d36935..1e57a98d6f738155005c399ad03ffe5c32099177 100644 (file)
@@ -24,7 +24,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
+/** \file blender/depsgraph/intern/builder/deg_builder_relations_layer.cc
  *  \ingroup depsgraph
  *
  * Methods for constructing depsgraph
index ba1b91629db83ec7625caf32d4a930993091c68a..ce3a4182a0f7c9cde72cfc92b240aeb9c39dfbe8 100644 (file)
@@ -88,7 +88,7 @@ static const int deg_debug_node_type_color_map[][2] = {
     {DEG_NODE_TYPE_GEOMETRY,          6},
     {DEG_NODE_TYPE_SEQUENCER,         7},
     {DEG_NODE_TYPE_SHADING,           8},
-    {DEG_NODE_TYPE_SHADING_PARAMETERS,9},
+    {DEG_NODE_TYPE_SHADING_PARAMETERS, 9},
     {DEG_NODE_TYPE_CACHE,             10},
     {DEG_NODE_TYPE_LAYER_COLLECTIONS, 11},
     {DEG_NODE_TYPE_COPY_ON_WRITE,     12},
index 9f25fcaaa32386ff53e97e03eb418bc7dd0c815b..81a4f2bc0cc3956061f5634767b46cf44c29c236 100644 (file)
@@ -296,7 +296,8 @@ IDDepsNode *Depsgraph::add_id_node(ID *id, bool do_tag, ID *id_cow_hint)
                 * referencing to.
                 */
                BLI_ghash_insert(id_hash, id, id_node);
-       } else if (do_tag) {
+       }
+       else if (do_tag) {
                id->tag |= LIB_TAG_DOIT;
        }
        return id_node;
index 0d06cc48b88e070b5b666cfe7d3798eb5bb19e1e..9e9a2c3899324603fa9352f99bc4670905837fd9 100644 (file)
@@ -225,9 +225,8 @@ void DEG_objects_iterator_next(BLI_Iterator *iter)
                BLI_assert(!BLI_listbase_is_empty(&base->collection_properties->data.group));
 
                /* Flushing depsgraph data. */
-               deg_flush_base_flags_and_settings(ob,
-                                                                                 base,
-                                                                                 data->base_flag);
+               deg_flush_base_flags_and_settings(
+                       ob, base, data->base_flag);
 
                if ((data->flag & DEG_OBJECT_ITER_FLAG_DUPLI) && (ob->transflag & OB_DUPLI)) {
                        data->dupli_parent = ob;
index bd1d0dc0504f4a343543c20d3bab9ad5377b8a77..03be601ce2c1f489dde8dda0139332b5f9000b8b 100644 (file)
@@ -25,7 +25,7 @@
  */
 
 
-/** \file blender/depsgraph/intern/eval/deg_eval_copy_on_write.h
+/** \file blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
  *  \ingroup depsgraph
  */
 
@@ -65,9 +65,7 @@ extern "C" {
 #  include "DNA_lamp_types.h"
 #  include "DNA_linestyle_types.h"
 #  include "DNA_material_types.h"
-#  include "DNA_mesh_types.h"
 #  include "DNA_node_types.h"
-#  include "DNA_scene_types.h"
 #  include "DNA_texture_types.h"
 #  include "DNA_world_types.h"
 #endif
index fbd8f20caf754080b599884ee6d3cc5b5a046fae..16678beec4d80ea09e222dc0497e32a546de7730 100644 (file)
@@ -19,7 +19,7 @@
  *
  */
 
-/** \file basic_engine.h
+/** \file basic_engine.c
  *  \ingroup draw_engine
  *
  * Simple engine for drawing color and/or depth.
index 5d2c93038658ec09663d0964586922f925fd4f02..13d141bf4bf0257bbe7baa14bc3b38fd044b320d 100644 (file)
@@ -1189,7 +1189,7 @@ void EEVEE_effects_cache_init(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata)
                /* This create an empty batch of N triangles to be positioned
                 * by the vertex shader 0.4ms against 6ms with instancing */
                const float *viewport_size = DRW_viewport_size_get();
-               const int sprite_ct = ((int)viewport_size[0]/2) * ((int)viewport_size[1]/2); /* brackets matters */
+               const int sprite_ct = ((int)viewport_size[0] / 2) * ((int)viewport_size[1] / 2); /* brackets matters */
                grp = DRW_shgroup_empty_tri_batch_create(e_data.dof_scatter_sh, psl->dof_scatter, sprite_ct);
 
                DRW_shgroup_uniform_buffer(grp, "colorBuffer", &effects->unf_source_buffer);
@@ -1577,7 +1577,7 @@ void EEVEE_draw_effects(EEVEE_Data *vedata)
                last = txl->bloom_downsample[0];
 
                for (int i = 1; i < effects->bloom_iteration_ct; ++i) {
-                       copy_v2_v2(effects->unf_source_texel_size, effects->downsamp_texel_size[i-1]);
+                       copy_v2_v2(effects->unf_source_texel_size, effects->downsamp_texel_size[i - 1]);
                        effects->unf_source_buffer = last;
 
                        DRW_framebuffer_bind(fbl->bloom_down_fb[i]);
@@ -1646,8 +1646,8 @@ void EEVEE_draw_effects(EEVEE_Data *vedata)
        SWAP_DOUBLE_BUFFERS();
 
        if (!stl->g_data->valid_double_buffer &&
-               ((effects->enabled_effects & EFFECT_DOUBLE_BUFFER) != 0) &&
-               (DRW_state_is_image_render() == false))
+           ((effects->enabled_effects & EFFECT_DOUBLE_BUFFER) != 0) &&
+           (DRW_state_is_image_render() == false))
        {
                /* If history buffer is not valid request another frame.
                 * This fix black reflections on area resize. */
index 4928abe3b011bf0e0b470e470e1ecb1a8dba4ab6..a8178f86a7e7a32030eae57f858f59130f642af4 100644 (file)
@@ -19,7 +19,7 @@
  *
  */
 
-/** \file eevee_lights.c
+/** \file eevee_lightprobes.c
  *  \ingroup DNA
  */
 
@@ -36,8 +36,6 @@
 
 #include "ED_screen.h"
 
-#include "DRW_render.h"
-
 #include "GPU_material.h"
 #include "GPU_texture.h"
 #include "GPU_glew.h"
@@ -473,7 +471,7 @@ void EEVEE_lightprobes_cache_add(EEVEE_SceneLayerData *sldata, Object *ob)
 
        /* Step 1 find all lamps in the scene and setup them */
        if ((probe->type == LIGHTPROBE_TYPE_CUBE && pinfo->num_cube >= MAX_PROBE) ||
-               (probe->type == LIGHTPROBE_TYPE_GRID && pinfo->num_grid >= MAX_PROBE))
+           (probe->type == LIGHTPROBE_TYPE_GRID && pinfo->num_grid >= MAX_PROBE))
        {
                printf("Too much probes in the scene !!!\n");
                return;
@@ -669,7 +667,7 @@ static void EEVEE_lightprobes_updates(EEVEE_SceneLayerData *sldata, EEVEE_PassLi
 
                /* Debug Display */
                if (BKE_object_is_visible(ob) &&
-                       DRW_state_draw_support() &&
+                   DRW_state_draw_support() &&
                    (probe->flag & LIGHTPROBE_FLAG_SHOW_DATA))
                {
                        ped->probe_size = probe->data_draw_size * 0.1f;
@@ -1347,9 +1345,9 @@ void EEVEE_lightprobes_refresh(EEVEE_SceneLayerData *sldata, EEVEE_Data *vedata)
                                                else if (((((int)grid_loc[0] % current_stride) == 0) &&
                                                          (((int)grid_loc[1] % current_stride) == 0) &&
                                                          (((int)grid_loc[2] % current_stride) == 0)) &&
-                                                       !((((int)grid_loc[0] % prev_stride) == 0) &&
-                                                         (((int)grid_loc[1] % prev_stride) == 0) &&
-                                                         (((int)grid_loc[2] % prev_stride) == 0)))
+                                                        !((((int)grid_loc[0] % prev_stride) == 0) &&
+                                                          (((int)grid_loc[1] % prev_stride) == 0) &&
+                                                          (((int)grid_loc[2] % prev_stride) == 0)))
                                                {
                                                        valid_cell = true;
                                                }
index 8138b9a0ffd8b0baf610ab05be620d6a81a52542..1fa5aae44925a259ff4d4c08b971dbb23a384746 100644 (file)
@@ -128,8 +128,8 @@ void EEVEE_lights_init(EEVEE_SceneLayerData *sldata)
 
        EEVEE_LampsInfo *linfo = sldata->lamps;
        if ((linfo->shadow_size != sh_size) ||
-               (linfo->shadow_method != sh_method) ||
-               (linfo->shadow_high_bitdepth != sh_high_bitdepth))
+           (linfo->shadow_method != sh_method) ||
+           (linfo->shadow_high_bitdepth != sh_high_bitdepth))
        {
                BLI_assert((sh_size > 0) && (sh_size <= 8192));
                DRW_TEXTURE_FREE_SAFE(sldata->shadow_pool);
@@ -242,7 +242,7 @@ void EEVEE_lights_cache_add(EEVEE_SceneLayerData *sldata, Object *ob)
                MEM_SAFE_FREE(led->storage);
 
                if (la->mode & (LA_SHAD_BUF | LA_SHAD_RAY)) {
-                       if (la->type == LA_SUN) {
+                       if (la->type == LA_SUN) {
                                int sh_nbr = 1; /* TODO : MSM */
                                int cascade_nbr = MAX_CASCADE_NUM; /* TODO : Custom cascade number */
 
@@ -463,12 +463,12 @@ static void eevee_light_setup(Object *ob, EEVEE_LampsInfo *linfo, EEVEE_LampEngi
 
        /* Make illumination power constant */
        if (la->type == LA_AREA) {
-               power = 1.0f / (evli->sizex * evli->sizey * 4.0f * M_PI) /* 1/(w*h*Pi) */
-                       80.0f; /* XXX : Empirical, Fit cycles power */
+               power = 1.0f / (evli->sizex * evli->sizey * 4.0f * M_PI) /* 1/(w*h*Pi) */
+                       80.0f; /* XXX : Empirical, Fit cycles power */
        }
        else if (la->type == LA_SPOT || la->type == LA_LOCAL) {
-               power = 1.0f / (4.0f * evli->radius * evli->radius * M_PI * M_PI) /* 1/(4*r²*Pi²) */
-                       M_PI * M_PI * M_PI * 10.0; /* XXX : Empirical, Fit cycles power */
+               power = 1.0f / (4.0f * evli->radius * evli->radius * M_PI * M_PI) /* 1/(4*r²*Pi²) */
+                       M_PI * M_PI * M_PI * 10.0; /* XXX : Empirical, Fit cycles power */
 
                /* for point lights (a.k.a radius == 0.0) */
                // power = M_PI * M_PI * 0.78; /* XXX : Empirical, Fit cycles power */
@@ -525,7 +525,7 @@ static void frustum_min_bounding_sphere(const float corners[8][4], float r_cente
 
        /* compute the bounding box */
        INIT_MINMAX(minvec, maxvec);
-       for (int i = 0; i < 8; ++i)     {
+       for (int i = 0; i < 8; ++i) {
                minmax_v3v3_v3(minvec, maxvec, corners[i]);
        }
 
@@ -542,7 +542,7 @@ static void frustum_min_bounding_sphere(const float corners[8][4], float r_cente
        /* Search the largest distance between the sphere center
         * and the front plane corners. */
        for (int i = 0; i < 4; ++i) {
-               float rad = len_v3v3(corners[4+i], r_center);
+               float rad = len_v3v3(corners[4 + i], r_center);
                if (rad > *r_radius) {
                        *r_radius = rad;
                }
@@ -648,11 +648,11 @@ static void eevee_shadow_cascade_setup(Object *ob, EEVEE_LampsInfo *linfo, EEVEE
                else {
                        cascade_data->split_start[c] = linear_split;
                }
-               cascade_data->split_end[c-1] = cascade_data->split_start[c];
+               cascade_data->split_end[c - 1] = cascade_data->split_start[c];
 
                /* Add some overlap for smooth transition */
-               cascade_data->split_start[c] = LERP(la->cascade_fade, cascade_data->split_end[c-1],
-                                                   (c > 1) ? cascade_data->split_end[c-2] : cascade_data->split_start[0]);
+               cascade_data->split_start[c] = LERP(la->cascade_fade, cascade_data->split_end[c - 1],
+                                                   (c > 1) ? cascade_data->split_end[c - 2] : cascade_data->split_start[0]);
 
                /* NDC Space */
                {
@@ -667,20 +667,20 @@ static void eevee_shadow_cascade_setup(Object *ob, EEVEE_LampsInfo *linfo, EEVEE
                }
 
                {
-                       float p[4] = {1.0f, 1.0f, cascade_data->split_end[c-1], 1.0f};
+                       float p[4] = {1.0f, 1.0f, cascade_data->split_end[c - 1], 1.0f};
                        /* TODO: we don't need full m4 multiply here */
                        mul_m4_v4(viewprojmat, p);
-                       splits_end_ndc[c-1] = p[2];
+                       splits_end_ndc[c - 1] = p[2];
 
                        if (is_persp) {
-                               splits_end_ndc[c-1] /= p[3];
+                               splits_end_ndc[c - 1] /= p[3];
                        }
                }
        }
 
        /* Set last cascade split fade distance into the first split_start. */
-       float prev_split = (cascade_nbr > 1) ? cascade_data->split_end[cascade_nbr-2] : cascade_data->split_start[0];
-       cascade_data->split_start[0] = LERP(la->cascade_fade, cascade_data->split_end[cascade_nbr-1], prev_split);
+       float prev_split = (cascade_nbr > 1) ? cascade_data->split_end[cascade_nbr - 2] : cascade_data->split_start[0];
+       cascade_data->split_start[0] = LERP(la->cascade_fade, cascade_data->split_end[cascade_nbr - 1], prev_split);
 
        /* For each cascade */
        for (int c = 0; c < cascade_nbr; ++c) {
@@ -699,7 +699,7 @@ static void eevee_shadow_cascade_setup(Object *ob, EEVEE_LampsInfo *linfo, EEVEE
                };
 
                /* Transform them into world space */
-               for (int i = 0; i < 8; ++i)     {
+               for (int i = 0; i < 8; ++i) {
                        mul_m4_v4(persinv, corners[i]);
                        mul_v3_fl(corners[i], 1.0f / corners[i][3]);
                        corners[i][3] = 1.0f;
@@ -712,7 +712,7 @@ static void eevee_shadow_cascade_setup(Object *ob, EEVEE_LampsInfo *linfo, EEVEE
                normalize_v3(viewmat[1]);
                normalize_v3(viewmat[2]);
 
-               for (int i = 0; i < 8; ++i)     {
+               for (int i = 0; i < 8; ++i) {
                        mul_m4_v4(viewmat, corners[i]);
                }
 
@@ -779,8 +779,8 @@ static bool cube_bbox_intersect(const float cube_center[3], float cube_half_dim,
                minmax_v3v3_v3(min, max, vec);
        }
 
-    if (MAX3(max[0], max[1], max[2]) < -cube_half_dim) return false;
-    if (MIN3(min[0], min[1], min[2]) >  cube_half_dim) return false;
+       if (MAX3(max[0], max[1], max[2]) < -cube_half_dim) return false;
+       if (MIN3(min[0], min[1], min[2]) >  cube_half_dim) return false;
 
        return true;
 }
index 37306dbc87a19fc48b5ffbf3d61531ba3c756b12..d706110351ea95c3f274747943531e69c09b1777 100644 (file)
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file eeveee_lut.h
+/** \file eevee_lut.h
  *  \ingroup gpu
  */
 
index 0073d975507a51d4bbc0d925ae008ca3cd94dbcd..91bdda39876ed633a7e8a1adbb8ca22925f92402 100644 (file)
@@ -233,7 +233,7 @@ static struct GPUTexture *create_ggx_refraction_lut_texture(int w, int h)
 
                DRW_framebuffer_read_data(0, 0, w, h, 3, 0, data);
 
-       #if 1
+#if 1
                fprintf(f, "\t{\n\t\t");
                for (int i = 0; i < w*h * 3; i+=3) {
                        fprintf(f, "%ff,", data[i]);
@@ -241,7 +241,7 @@ static struct GPUTexture *create_ggx_refraction_lut_texture(int w, int h)
                        else fprintf(f, " ");
                }
                fprintf(f, "\n\t},\n");
-       #else
+#else
                for (int i = 0; i < w*h * 3; i+=3) {
                        if (data[i] < 0.01) printf(" ");
                        else if (data[i] < 0.3) printf(".");
@@ -250,7 +250,7 @@ static struct GPUTexture *create_ggx_refraction_lut_texture(int w, int h)
                        else printf("#");
                        if ((i/3+1) % 64 == 0) printf("\n");
                }
-       #endif
+#endif
 
        } while (roughness < 1.0f);
        fprintf(f, "\n};\n");
@@ -445,8 +445,8 @@ void EEVEE_update_util_texture(float offset)
        /* Copy bsdf_split_sum_ggx into 2nd layer red and green channels.
           Copy ltc_mag_ggx into 2nd layer blue channel. */
        for (int i = 0; i < 64 * 64; i++) {
-               texels_layer[i][0] = bsdf_split_sum_ggx[i*2 + 0];
-               texels_layer[i][1] = bsdf_split_sum_ggx[i*2 + 1];
+               texels_layer[i][0] = bsdf_split_sum_ggx[i * 2 + 0];
+               texels_layer[i][1] = bsdf_split_sum_ggx[i * 2 + 1];
                texels_layer[i][2] = ltc_mag_ggx[i];
        }
        texels_layer += 64 * 64;
@@ -467,10 +467,10 @@ void EEVEE_update_util_texture(float offset)
        /* Copy Refraction GGX LUT in layer 4 - 20 */
        for (int j = 0; j < 16; ++j) {
                for (int i = 0; i < 64 * 64; i++) {
-                       texels_layer[i][0] = btdf_split_sum_ggx[j*2][i];
-                       texels_layer[i][1] = btdf_split_sum_ggx[j*2][i];
-                       texels_layer[i][2] = btdf_split_sum_ggx[j*2][i];
-                       texels_layer[i][3] = btdf_split_sum_ggx[j*2][i];
+                       texels_layer[i][0] = btdf_split_sum_ggx[j * 2][i];
+                       texels_layer[i][1] = btdf_split_sum_ggx[j * 2][i];
+                       texels_layer[i][2] = btdf_split_sum_ggx[j * 2][i];
+                       texels_layer[i][3] = btdf_split_sum_ggx[j * 2][i];
                }
                texels_layer += 64 * 64;
        }
@@ -933,7 +933,7 @@ void EEVEE_materials_cache_init(EEVEE_Data *vedata)
        } \
 } while (0)
 
-typedef struct EeveeMaterialShadingGroups{
+typedef struct EeveeMaterialShadingGroups {
        struct DRWShadingGroup *shading_grp;
        struct DRWShadingGroup *depth_grp;
        struct DRWShadingGroup *depth_clip_grp;
index 9d93097b7fdeefad1d0f02802c1d1dc12a2bfa29..45dabc37e066ecf1de7ec946483549ffaa8224c0 100644 (file)
@@ -159,7 +159,7 @@ typedef struct EEVEE_FramebufferList {
        struct GPUFrameBuffer *effect_fb;
        struct GPUFrameBuffer *bloom_blit_fb;
        struct GPUFrameBuffer *bloom_down_fb[MAX_BLOOM_STEP];
-       struct GPUFrameBuffer *bloom_accum_fb[MAX_BLOOM_STEP-1];
+       struct GPUFrameBuffer *bloom_accum_fb[MAX_BLOOM_STEP - 1];
        struct GPUFrameBuffer *dof_down_fb;
        struct GPUFrameBuffer *dof_scatter_far_fb;
        struct GPUFrameBuffer *dof_scatter_near_fb;
@@ -184,7 +184,7 @@ typedef struct EEVEE_TextureList {
        struct GPUTexture *dof_far_blur; /* R16_G16_B16_A16 */
        struct GPUTexture *bloom_blit; /* R16_G16_B16 */
        struct GPUTexture *bloom_downsample[MAX_BLOOM_STEP]; /* R16_G16_B16 */
-       struct GPUTexture *bloom_upsample[MAX_BLOOM_STEP-1]; /* R16_G16_B16 */
+       struct GPUTexture *bloom_upsample[MAX_BLOOM_STEP - 1]; /* R16_G16_B16 */
        struct GPUTexture *ssr_normal_input;
        struct GPUTexture *ssr_specrough_input;
        struct GPUTexture *refract_color;
index e765a0fe3a80dedbb1b9f5d281c7e0c8eac37126..f4b38b7ebbfa3b3b39ba5edad76d46c0f7f536e0 100644 (file)
@@ -19,7 +19,7 @@
  *
  */
 
-/** \file external_engine.h
+/** \file external_engine.c
  *  \ingroup draw_engine
  *
  * Base engine for external render engines.
index 8bf7aff555e2db9fd28355a5c85d547b57d63631..13df65cf7414005f387b6595aae172918e0d405e 100644 (file)
@@ -250,7 +250,7 @@ Gwn_Batch *DRW_cache_fullscreen_quad_get(void)
                Gwn_VertBuf *vbo = GWN_vertbuf_create_with_format(&format);
                GWN_vertbuf_data_alloc(vbo, 3);
 
-               for (int i = 0; i < 3; ++i)     {
+               for (int i = 0; i < 3; ++i) {
                        GWN_vertbuf_attr_set(vbo, attr_id.pos, i, pos[i]);
                        GWN_vertbuf_attr_set(vbo, attr_id.uvs, i, uvs[i]);
                }
@@ -279,7 +279,7 @@ Gwn_Batch *DRW_cache_quad_get(void)
                Gwn_VertBuf *vbo = GWN_vertbuf_create_with_format(&format);
                GWN_vertbuf_data_alloc(vbo, 4);
 
-               for (int i = 0; i < 4; ++i)     {
+               for (int i = 0; i < 4; ++i) {
                        GWN_vertbuf_attr_set(vbo, attr_id.pos, i, pos[i]);
                        GWN_vertbuf_attr_set(vbo, attr_id.uvs, i, uvs[i]);
                }
@@ -391,7 +391,7 @@ Gwn_Batch *DRW_cache_square_get(void)
 
                for (int i = 0; i < 4; i++) {
                        GWN_vertbuf_attr_set(vbo, attr_id.pos, i * 2,     p[i % 4]);
-                       GWN_vertbuf_attr_set(vbo, attr_id.pos, i * 2 + 1, p[(i+1) % 4]);
+                       GWN_vertbuf_attr_set(vbo, attr_id.pos, i * 2 + 1, p[(i + 1) % 4]);
                }
 
                SHC.drw_square = GWN_batch_create_ex(GWN_PRIM_LINES, vbo, NULL, GWN_BATCH_OWNS_VBO);
@@ -1196,8 +1196,8 @@ Gwn_Batch *DRW_cache_lamp_spot_get(void)
 
                        GWN_vertbuf_attr_set(vbo, attr_id.n1, i * 4,     n[(i) % NSEGMENTS]);
                        GWN_vertbuf_attr_set(vbo, attr_id.n1, i * 4 + 1, n[(i) % NSEGMENTS]);
-                       GWN_vertbuf_attr_set(vbo, attr_id.n2, i * 4,     n[(i+1) % NSEGMENTS]);
-                       GWN_vertbuf_attr_set(vbo, attr_id.n2, i * 4 + 1, n[(i+1) % NSEGMENTS]);
+                       GWN_vertbuf_attr_set(vbo, attr_id.n2, i * 4,     n[(i + 1) % NSEGMENTS]);
+                       GWN_vertbuf_attr_set(vbo, attr_id.n2, i * 4 + 1, n[(i + 1) % NSEGMENTS]);
 
                        /* end ring */
                        v[0] = cv[0], v[1] = cv[1], v[2] = -1.0f;
@@ -1245,8 +1245,8 @@ Gwn_Batch *DRW_cache_lamp_spot_square_get(void)
                        GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, p[0]);
                        GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, p[i]);
 
-                       GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, p[(i % 4)+1]);
-                       GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, p[((i+1) % 4)+1]);
+                       GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, p[(i % 4) + 1]);
+                       GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, p[((i + 1) % 4) + 1]);
                }
 
                SHC.drw_lamp_spot_square = GWN_batch_create_ex(GWN_PRIM_LINES, vbo, NULL, GWN_BATCH_OWNS_VBO);
@@ -1351,7 +1351,7 @@ Gwn_Batch *DRW_cache_lightprobe_cube_get(void)
                Gwn_VertBuf *vbo = GWN_vertbuf_create_with_format(&format);
                GWN_vertbuf_data_alloc(vbo, (6 + 3) * 2);
 
-               for (int i = 0; i < 6; ++i)     {
+               for (int i = 0; i < 6; ++i) {
                        GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, v[i]);
                        GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, v[(i + 1) % 6]);
                }
@@ -1396,7 +1396,7 @@ Gwn_Batch *DRW_cache_lightprobe_grid_get(void)
                Gwn_VertBuf *vbo = GWN_vertbuf_create_with_format(&format);
                GWN_vertbuf_data_alloc(vbo, (6 * 2 + 3) * 2);
 
-               for (int i = 0; i < 6; ++i)     {
+               for (int i = 0; i < 6; ++i) {
                        float tmp_v1[3], tmp_v2[3], tmp_tr[3];
                        copy_v3_v3(tmp_v1, v[i]);
                        copy_v3_v3(tmp_v2, v[(i + 1) % 6]);
@@ -1449,7 +1449,7 @@ Gwn_Batch *DRW_cache_lightprobe_planar_get(void)
                Gwn_VertBuf *vbo = GWN_vertbuf_create_with_format(&format);
                GWN_vertbuf_data_alloc(vbo, 4 * 2);
 
-               for (int i = 0; i < 4; ++i)     {
+               for (int i = 0; i < 4; ++i) {
                        GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, v[i]);
                        GWN_vertbuf_attr_set(vbo, attr_id.pos, v_idx++, v[(i + 1) % 4]);
                }
@@ -1623,7 +1623,7 @@ static const unsigned int bone_box_solid_tris[12][3] = {
 /* aligned with bone_octahedral_solid_tris */
 static const float bone_box_solid_normals[12][3] = {
        { 0.0f, -1.0f,  0.0f},
-    { 0.0f, -1.0f,  0.0f},
+       { 0.0f, -1.0f,  0.0f},
 
        { 1.0f,  0.0f,  0.0f},
        { 1.0f,  0.0f,  0.0f},
@@ -1782,10 +1782,10 @@ Gwn_Batch *DRW_cache_bone_envelope_solid_get(void)
                        float co1[3], co2[3], co3[3], co4[3];
 
                        for (int j = 0; j < lat_res; j++, lat += lat_inc) {
-                               benv_lat_lon_to_co(lat          , lon          , co1);
-                               benv_lat_lon_to_co(lat          , lon + lon_inc, co2);
+                               benv_lat_lon_to_co(lat,           lon,           co1);
+                               benv_lat_lon_to_co(lat,           lon + lon_inc, co2);
                                benv_lat_lon_to_co(lat + lat_inc, lon + lon_inc, co3);
-                               benv_lat_lon_to_co(lat + lat_inc, lon          , co4);
+                               benv_lat_lon_to_co(lat + lat_inc, lon,           co4);
 
                                if (j != 0) {  /* At pole, n1 and n2 are identical. */
                                        benv_add_tri(vbo, attr_id.pos, &v_idx, co1, co2, co3);
index 6b3ef31f8dd4b5cfd066d3677c84690766dfb90c..33d7cab285fa9d1b84ca4780430ce2f27cdcfead 100644 (file)
@@ -654,7 +654,7 @@ static MeshRenderData *mesh_render_data_create_ex(
 
                        /* If tangent from orco is requested, decrement tangent_len */
                        int actual_tangent_len = (cd_lused[CD_TANGENT] & DM_TANGENT_MASK_ORCO) ?
-                                               rdata->cd.layers.tangent_len - 1 : rdata->cd.layers.tangent_len;
+                               rdata->cd.layers.tangent_len - 1 : rdata->cd.layers.tangent_len;
                        if (rdata->edit_bmesh) {
                                BMEditMesh *em = rdata->edit_bmesh;
                                BMesh *bm = em->bm;
@@ -3107,7 +3107,7 @@ static Gwn_VertBuf *mesh_create_edge_pos_with_sel(
 
                const int edge_len = mesh_render_data_edges_len_get(rdata);
 
-               vbo= GWN_vertbuf_create_with_format(&format);
+               vbo = GWN_vertbuf_create_with_format(&format);
 
                const int vbo_len_capacity = edge_len * 2;
                int vbo_len_used = 0;
index 05b8f1657c42781039d9f476cc4e8ca92f4a55e9..1c83b813355c0e36e61a156ebd3b51e96aba84c0 100644 (file)
@@ -1997,7 +1997,7 @@ static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state)
                unit_m4(obmat);
 
                if (shgroup->type == DRW_SHG_INSTANCE &&
-                       (interface->instance_count > 0 || interface->instance_batch != NULL))
+                   (interface->instance_count > 0 || interface->instance_batch != NULL))
                {
                        GPU_SELECT_LOAD_IF_PICKSEL_LIST(&shgroup->calls);
                        draw_geometry(shgroup, shgroup->instance_geom, obmat, shgroup->instance_data);
index 2b913bcbb8df4f17cd430c0d7ca43a1437f2d595..f9fbbac2e2ed946abdf101b2a93be0134d699f40 100644 (file)
@@ -85,7 +85,7 @@ void DRW_stats_begin(void)
                DTP.timer_count = DTP.chunk_count * CHUNK_SIZE;
                DTP.timers = MEM_callocN(sizeof(DRWTimer) * DTP.timer_count, "DRWTimer stack");
        }
-       else if(!DTP.is_recording && DTP.timers != NULL) {
+       else if (!DTP.is_recording && DTP.timers != NULL) {
                DRW_stats_free();
        }
 
index 1ad77c9ac1b2f3fa7b054c1786455b8d34d1ed80..db0ac5a1d1118209768ab0137730bdcdeb7c2ba9 100644 (file)
@@ -48,7 +48,6 @@
 #include "BKE_image.h"
 #include "BKE_texture.h"
 
-#include "ED_view3d.h"
 #include "ED_view3d.h"
 
 #include "GPU_shader.h"
@@ -119,7 +118,7 @@ typedef struct OBJECT_Data {
 
 /* *********** STATIC *********** */
 
-typedef struct OBJECT_PrivateData{
+typedef struct OBJECT_PrivateData {
        /* Empties */
        DRWShadingGroup *plain_axes;
        DRWShadingGroup *cube;
@@ -487,7 +486,8 @@ static void OBJECT_engine_init(void *vedata)
                        /* Persp : If camera is below floor plane, we switch clipping
                         * Ortho : If eye vector is looking up, we switch clipping */
                        if (((winmat[3][3] == 0.0f) && (e_data.camera_pos[2] > 0.0f)) ||
-                               ((winmat[3][3] != 0.0f) && (zvec[2] < 0.0f))) {
+                           ((winmat[3][3] != 0.0f) && (zvec[2] < 0.0f)))
+                       {
                                e_data.zpos_flag |= CLIP_ZPOS;
                                e_data.zneg_flag |= CLIP_ZNEG;
                        }
@@ -1548,7 +1548,7 @@ static void DRW_shgroup_lightprobe(OBJECT_StorageList *stl, OBJECT_PassList *psl
                }
 
                if (prb->type == LIGHTPROBE_TYPE_GRID ||
-                       prb->attenuation_type == LIGHTPROBE_SHAPE_BOX)
+                   prb->attenuation_type == LIGHTPROBE_SHAPE_BOX)
                {
                        DRW_shgroup_call_dynamic_add(stl->g_data->cube, color, &prb->distgridinf, ob->obmat);
                        DRW_shgroup_call_dynamic_add(stl->g_data->cube, color, &prb->distfalloff, ob->obmat);
index b96e04a8a6077b8d50729f3ff1b10eaa7e8b7c56..41c1c73e49cf0e32ac8c1a00af5704b459382f8e 100644 (file)
@@ -2033,12 +2033,12 @@ static void sk_drawSketch(Scene *scene, View3D *UNUSED(v3d), SK_Sketch *sketch,
                                glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
                                switch (sketch->next_point.mode) {
-                               case PT_SNAP:
-                                       copy_v4_fl4(tmp_color, 0.0f, 1.0f, 0.0f, 1.0f);
-                                       break;
-                               case PT_PROJECT:
-                                       copy_v4_fl4(tmp_color, 0.0f, 0.0f, 0.0f, 1.0f);
-                                       break;
+                                       case PT_SNAP:
+                                               copy_v4_fl4(tmp_color, 0.0f, 1.0f, 0.0f, 1.0f);
+                                               break;
+                                       case PT_PROJECT:
+                                               copy_v4_fl4(tmp_color, 0.0f, 0.0f, 0.0f, 1.0f);
+                                               break;
                                }
 
                                sk_drawPoint(&sketch->next_point, 0.1, tmp_color);
index 0cb8b9211aebdc5139719b3af92342b85cb2f3d4..e46c6a0e267f2fbfdb43c2768d126155a12b9ff2 100644 (file)
@@ -1650,7 +1650,7 @@ void ui_draw_but_CURVE(ARegion *ar, uiBut *but, uiWidgetColors *wcol, const rcti
        immUniformColor3ubv((unsigned char *)wcol->item);
        glEnable(GL_LINE_SMOOTH);
        glEnable(GL_BLEND);
-       immBegin(GWN_PRIM_LINE_STRIP, (CM_TABLE+1) + 2);
+       immBegin(GWN_PRIM_LINE_STRIP, (CM_TABLE + 1) + 2);
        
        if (cuma->table == NULL)
                curvemapping_changed(cumap, false);
@@ -1812,14 +1812,14 @@ void ui_draw_but_TRACKPREVIEW(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wc
                        UI_GetThemeColor4fv(TH_MARKER_OUTLINE, col_outline);
 
                        /* Do stipple cross with geometry */
-                       immBegin(GWN_PRIM_LINES, 7*2*2);
+                       immBegin(GWN_PRIM_LINES, 7 * 2 * 2);
                        float pos_sel[8] = {-10.0f, -7.0f, -4.0f, -1.0f, 2.0f, 5.0f, 8.0f, 11.0f};
                        for (int axe = 0; axe < 2; ++axe) {
                                for (int i = 0; i < 7; ++i) {
                                        float x1 = pos_sel[i] * (1 - axe);
                                        float y1 = pos_sel[i] * axe;
-                                       float x2 = pos_sel[i+1] * (1 - axe);
-                                       float y2 = pos_sel[i+1] * axe;
+                                       float x2 = pos_sel[i + 1] * (1 - axe);
+                                       float y2 = pos_sel[i + 1] * axe;
 
                                        if (i % 2 == 1)
                                                immAttrib4fv(col, col_sel);
index e1739af3f0d56732d4bcb2f3e3a658414b90bd63..ebd4ce36bbe304caf2bb168a775bf2a8aa4baf26 100644 (file)
@@ -121,7 +121,7 @@ static void template_add_button_search_menu(
                /* Ugly exception for screens here, drawing their preview in icon size looks ugly/useless */
                const bool use_preview_icon = use_big_size || (id && (GS(id->name) != ID_SCR));
                const short width = UI_UNIT_X * (use_big_size ? 6 : 1.6f);
-               const short height = UI_UNIT_Y * (use_big_size ? 6: 1);
+               const short height = UI_UNIT_Y * (use_big_size ? 6 : 1);
 
                but = uiDefBlockButN(block, block_func, block_argN, "", 0, 0, width, height, tip);
                if (use_preview_icon) {
index 53cc6607b2eb0368e40749c3cc3339535a9cc8cf..bb625bc0ff8b0a0683f6e683f8cf6262e881018f 100644 (file)
@@ -1565,7 +1565,7 @@ void UI_view2d_multi_grid_draw(View2D *v2d, int colorid, float step, int level_s
        }
 
        /* X and Y axis */
-       UI_GetThemeColorShade3ubv(colorid, -18 + ((totlevels - 1) * -6) , grid_line_color);
+       UI_GetThemeColorShade3ubv(colorid, -18 + ((totlevels - 1) * -6), grid_line_color);
 
        immSkipAttrib(color);
        immVertex2f(pos, 0.0f, v2d->cur.ymin);
index 0769d128b4d346eab528a73051cd962b75db042e..ec490a0d047507e76df058e945db8b056d82dcbf 100644 (file)
@@ -221,7 +221,7 @@ static void dial_ghostarc_get_angles(
        plane_from_point_normal_v3(dial_plane, mpr->matrix_basis[3], axis_vec);
 
        if (!ED_view3d_win_to_ray(ar, v3d, inter->init_mval, ray_co, ray_no, false) ||
-               !isect_ray_plane_v3(ray_co, ray_no, dial_plane, &ray_lambda, false))
+           !isect_ray_plane_v3(ray_co, ray_no, dial_plane, &ray_lambda, false))
        {
                goto fail;
        }
@@ -229,7 +229,7 @@ static void dial_ghostarc_get_angles(
        sub_v3_v3(proj_mval_init_rel, mpr->matrix_basis[3]);
 
        if (!ED_view3d_win_to_ray(ar, v3d, mval, ray_co, ray_no, false) ||
-               !isect_ray_plane_v3(ray_co, ray_no, dial_plane, &ray_lambda, false))
+           !isect_ray_plane_v3(ray_co, ray_no, dial_plane, &ray_lambda, false))
        {
                goto fail;
        }
index 72bc61139c6af27439a991c45bbebf7db4e46f26..6ed1c021c6c0928f493c168b35aeb78a71f9a445 100644 (file)
@@ -823,8 +823,8 @@ void ED_mask_draw_frames(Mask *mask, ARegion *ar, const int cfra, const int sfra
                        immBegin(GWN_PRIM_LINES, 2 * num_lines);
 
                        for (MaskLayerShape *masklay_shape = masklay->splines_shapes.first;
-                                 masklay_shape;
-                                 masklay_shape = masklay_shape->next)
+                            masklay_shape;
+                            masklay_shape = masklay_shape->next)
                        {
                                int frame = masklay_shape->frame;
 
index baeab6d2071fdd54feb04bb732e4dff9e07a98de..b2a16d9373b9c7b4a4979214c3441e84d8f72f3a 100644 (file)
@@ -3303,13 +3303,13 @@ static int edbm_separate_exec(bContext *C, wmOperator *op)
                /* editmode separate */
                switch (type) {
                        case MESH_SEPARATE_SELECTED:
-                           retval = mesh_separate_selected(bmain, scene, sl, base, em->bm);
+                               retval = mesh_separate_selected(bmain, scene, sl, base, em->bm);
                                break;
                        case MESH_SEPARATE_MATERIAL:
-                           retval = mesh_separate_material(bmain, scene, sl, base, em->bm);
+                               retval = mesh_separate_material(bmain, scene, sl, base, em->bm);
                                break;
                        case MESH_SEPARATE_LOOSE:
-                           retval = mesh_separate_loose(bmain, scene, sl, base, em->bm);
+                               retval = mesh_separate_loose(bmain, scene, sl, base, em->bm);
                                break;
                        default:
                                BLI_assert(0);
@@ -3344,10 +3344,10 @@ static int edbm_separate_exec(bContext *C, wmOperator *op)
 
                                        switch (type) {
                                                case MESH_SEPARATE_MATERIAL:
-                                                   retval_iter = mesh_separate_material(bmain, scene, sl, base_iter, bm_old);
+                                                       retval_iter = mesh_separate_material(bmain, scene, sl, base_iter, bm_old);
                                                        break;
                                                case MESH_SEPARATE_LOOSE:
-                                                   retval_iter = mesh_separate_loose(bmain, scene, sl, base_iter, bm_old);
+                                                       retval_iter = mesh_separate_loose(bmain, scene, sl, base_iter, bm_old);
                                                        break;
                                                default:
                                                        BLI_assert(0);
index 87b59da6c62ee5ee77fdd1a6523d5318a72d894a..d526ea93ffa160b57fb11ab6ffd9cb0d7ecce22d 100644 (file)
@@ -146,7 +146,7 @@ static void object_fmap_swap_object_mode(Object *ob, int num1, int num2)
                                        if (num1 != -1) {
                                                if (map[i] == num1)
                                                        map[i] = num2;
-                                               else if (map[i]== num2)
+                                               else if (map[i] == num2)
                                                        map[i] = num1;
                                        }
                                }
index 628c5b846a3a16cd133366d2dfc0a762fab5258f..280294e714dbc93b28f9324dddd594f511029e95 100644 (file)
@@ -940,13 +940,13 @@ static int object_select_all_exec(bContext *C, wmOperator *op)
        {
                switch (action) {
                        case SEL_SELECT:
-                           ED_object_base_select(base, BA_SELECT);
+                               ED_object_base_select(base, BA_SELECT);
                                break;
                        case SEL_DESELECT:
-                           ED_object_base_select(base, BA_DESELECT);
+                               ED_object_base_select(base, BA_DESELECT);
                                break;
                        case SEL_INVERT:
-                           if ((base->flag & BASE_SELECTED) != 0) {
+                               if ((base->flag & BASE_SELECTED) != 0) {
                                        ED_object_base_select(base, BA_DESELECT);
                                }
                                else {
index 0f06d66d033f1bbc378a96cada47099930756220..631d891ce021fc6cdfec3b7adaf1827cf2471176 100644 (file)
@@ -234,7 +234,7 @@ void clip_draw_dopesheet_main(SpaceClip *sc, ARegion *ar, Scene *scene)
 
                                /* check if visible */
                                if (IN_RANGE(yminc, v2d->cur.ymin, v2d->cur.ymax) ||
-                                        IN_RANGE(ymaxc, v2d->cur.ymin, v2d->cur.ymax))
+                                   IN_RANGE(ymaxc, v2d->cur.ymin, v2d->cur.ymax))
                                {
                                        MovieTrackingTrack *track = channel->track;
                                        int i;
index bc218a3594d7bb7ee7ce2a416707469b61e4457e..c1e298c426f571e5baf8a88a3e9f41aed033e70d 100644 (file)
@@ -400,7 +400,7 @@ static void file_draw_preview(
        /* border */
        if (use_dropshadow) {
                Gwn_VertFormat *format = immVertexFormat();
-               unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2,GWN_FETCH_FLOAT);
+               unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2, GWN_FETCH_FLOAT);
 
                immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
                immUniformColor4f(0.0f, 0.0f, 0.0f, 0.4f);
index af71851cf6471ea416ae5b1582321e70efd24e5e..7cb22dcc5708503f495672df3c9e42f5c1c89b59 100644 (file)
@@ -49,8 +49,6 @@
 #include "ED_node.h"
 #include "ED_render.h"
 #include "ED_screen.h"
-#include "WM_api.h"
-#include "WM_types.h"
 
 #include "UI_resources.h"
 #include "UI_view2d.h"
@@ -58,6 +56,7 @@
 #include "RNA_access.h"
 
 #include "WM_api.h"
+#include "WM_types.h"
 
 #include "node_intern.h"  /* own include */
 
index a9066086467ba1b9071bafe73fff9e243983f4eb..7ecb5cb072d75e5c9d3daaf37624527c848c4e57 100644 (file)
@@ -333,9 +333,7 @@ static void time_draw_idblock_keyframes(View2D *v2d, ID *id, short onlysel, cons
 
                immBeginAtMost(GWN_PRIM_LINES, max_len * 2);
 
-               for (; (ak) && (ak->cfra <= v2d->cur.xmax);
-                       ak = ak->next)
-               {
+               for (; (ak) && (ak->cfra <= v2d->cur.xmax); ak = ak->next) {
                        immVertex2f(pos, ak->cfra, ymin);
                        immVertex2f(pos, ak->cfra, ymax);
                }
index 11aa3476ee1c0ac3e66c3c716919d38b8182e14f..b4bd425b038368a04524c0bb28760c84149c0b46 100644 (file)
@@ -439,7 +439,7 @@ static void drawcube_size(float xsize, float ysize, float zsize)
                /* Elements */
                GWN_indexbuf_init(&elb, GWN_PRIM_LINES, 12, 8);
                for (int i = 0; i < 12; ++i) {
-                       GWN_indexbuf_add_line_verts(&elb, cube_wire[i*2], cube_wire[i*2+1]);
+                       GWN_indexbuf_add_line_verts(&elb, cube_wire[i * 2], cube_wire[i * 2 + 1]);
                }
                GWN_indexbuf_build_in_place(&elb, &el);
 
@@ -591,7 +591,7 @@ static void draw_bone_octahedral(void)
                /* Elements */
                GWN_indexbuf_init(&elb, GWN_PRIM_LINES, 12, 6);
                for (int i = 0; i < 12; ++i) {
-                       GWN_indexbuf_add_line_verts(&elb, bone_octahedral_wire[i*2], bone_octahedral_wire[i*2+1]);
+                       GWN_indexbuf_add_line_verts(&elb, bone_octahedral_wire[i * 2], bone_octahedral_wire[i * 2 + 1]);
                }
                GWN_indexbuf_build_in_place(&elb, &el);
 
@@ -938,7 +938,7 @@ static void draw_sphere_bone_wire(float smat[4][4], float imat[4][4],
        
        /* base */
        if (armflag & ARM_EDITMODE) {
-               if (boneflag & BONE_SELECTED){
+               if (boneflag & BONE_SELECTED) {
                        UI_GetThemeColor4fv(TH_SELECT, fcolor);
                }
                else {
@@ -1738,7 +1738,7 @@ static void imm_sphere_project(unsigned int pos, float ax, float az)
 static void draw_dof_ellipse(unsigned int pos, float ax, float az)
 {
        const int n = 16;
-       const int tri = n*n - 2*n + 1; /* Yay fancy math ! */
+       const int tri = n * n - 2 * n + 1; /* Yay fancy math ! */
        const float staticSine[16] = {
                0.0f, 0.104528463268f, 0.207911690818f, 0.309016994375f,
                0.406736643076f, 0.5f, 0.587785252292f, 0.669130606359f,
@@ -1755,7 +1755,7 @@ static void draw_dof_ellipse(unsigned int pos, float ax, float az)
 
        immUniformColor4ub(70, 70, 70, 50);
 
-       immBegin(GWN_PRIM_TRIS, tri*3);
+       immBegin(GWN_PRIM_TRIS, tri * 3);
        pz = 0.0f;
        for (i = 1; i < n; i++) {
                z = staticSine[i];
@@ -2245,8 +2245,11 @@ static void draw_pose_bones(
                                                if (arm->flag & ARM_POSEMODE) {
                                                        if (constflag & PCHAN_HAS_IK) {
                                                                if (bone->flag & BONE_SELECTED) {
-                                                                       if (constflag & PCHAN_HAS_TARGET) rgba_float_args_set(fcolor, 200.f/255.f, 120.f/255.f, 0.f/255.f, 1.0f);
-                                                                       else rgba_float_args_set(fcolor, 200.f/255.f, 200.f/255.f, 50.f/255.f, 1.0f);  /* add theme! */
+                                                                       if (constflag & PCHAN_HAS_TARGET) {
+                                                                               rgba_float_args_set(fcolor, 200.f / 255.f, 120.f / 255.f, 0.f / 255.f, 1.0f);
+                                                                       }
+                                                                       /* add theme! */
+                                                                       else rgba_float_args_set(fcolor, 200.f / 255.f, 200.f / 255.f, 50.f / 255.f, 1.0f);
 
                                                                        GPU_select_load_id(index & 0xFFFF);
                                                                        pchan_draw_IK_root_lines(pchan, !(do_dashed & DASH_HELP_LINES));
@@ -2254,8 +2257,9 @@ static void draw_pose_bones(
                                                        }
                                                        else if (constflag & PCHAN_HAS_SPLINEIK) {
                                                                if (bone->flag & BONE_SELECTED) {
-                                                                       rgba_float_args_set(fcolor, 150.f/255.f, 200.f/255.f, 50.f/255.f, 1.0f);  /* add theme! */
-                                                                       
+                                                                       /* add theme! */
+                                                                       rgba_float_args_set(fcolor, 150.f / 255.f, 200.f / 255.f, 50.f / 255.f, 1.0f);
+
                                                                        GPU_select_load_id(index & 0xFFFF);
                                                                        pchan_draw_IK_root_lines(pchan, !(do_dashed & DASH_HELP_LINES));
                                                                }
index fa88d63ae1cf5e4ea88d7457c8ef6ec4e32b1a4a..07d072f0156ecb95d0a868b8906f893647cb2504 100644 (file)
@@ -823,7 +823,7 @@ static void drawcentercircle(View3D *v3d, RegionView3D *UNUSED(rv3d), const floa
        const float outlineWidth = 1.0f * U.pixelsize;
        const float size = U.obcenter_dia * U.pixelsize + outlineWidth;
 
-       if (v3d->zbuf) {
+       if (v3d->zbuf) {
                glDisable(GL_DEPTH_TEST);
                /* TODO(merwin): fit things like this into plates/buffers design */
        }
@@ -860,7 +860,7 @@ static void drawcentercircle(View3D *v3d, RegionView3D *UNUSED(rv3d), const floa
        GPU_disable_program_point_size();
        glDisable(GL_BLEND);
 
-       if (v3d->zbuf) {
+       if (v3d->zbuf) {
                glEnable(GL_DEPTH_TEST);
        }
 }
@@ -8760,7 +8760,7 @@ void draw_object(
                if ((dflag & DRAW_PICKING) == 0) {
                        if ((dt == OB_BOUNDBOX) || ELEM(ob->type, OB_EMPTY, OB_LAMP, OB_CAMERA, OB_SPEAKER)) {
                                goto afterdraw;
-                               }
+                       }
                }
 
                switch (ob->type) {
index b01c8a7ac8af45f58e4d33c8e9b1d94cd292f54b..ed4d7861d6d6dd8a3437ca69eff1a7ce7a9a2028 100644 (file)
 
 #include "DRW_engine.h"
 
-#include "ED_keyframing.h"
 #include "ED_armature.h"
 #include "ED_keyframing.h"
 #include "ED_gpencil.h"
 #include "ED_screen.h"
 #include "ED_transform.h"
-#include "ED_gpencil.h"
 
 #include "DEG_depsgraph_query.h"
 
index b3b5beb54fea797c65b9a46b5ca954d19caa535e..d24c8241855dde9adac384b5298b4c92f7b19cc2 100644 (file)
@@ -72,8 +72,6 @@
 
 #include "DEG_depsgraph.h"
 
-#include "RE_engine.h"
-
 #include "IMB_imbuf_types.h"
 #include "IMB_imbuf.h"
 #include "IMB_colormanagement.h"
index d50133e406c190f46636882478240c5169e26cd2..b54d1254293ab18223b57b201be3c81e279bbee0 100644 (file)
@@ -3676,8 +3676,7 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op)
                new_dist = rv3d->dist;
 
                /* convert the drawn rectangle into 3d space */
-               if (depth_close != FLT_MAX && ED_view3d_unproject(ar, centx, centy, depth_close, p))
-               {
+               if (depth_close != FLT_MAX && ED_view3d_unproject(ar, centx, centy, depth_close, p)) {
                        negate_v3_v3(new_ofs, p);
                }
                else {
@@ -4940,8 +4939,7 @@ bool ED_view3d_autodist(
                float centx = (float)mval[0] + 0.5f;
                float centy = (float)mval[1] + 0.5f;
 
-               if (ED_view3d_unproject(ar, centx, centy, depth_close, mouse_worldloc))
-               {
+               if (ED_view3d_unproject(ar, centx, centy, depth_close, mouse_worldloc)) {
                        return true;
                }
        }
index 215be83abf4930b99fdfa63fb941dc7ca017d77c..2bed1dd28f2e4150b5d5c801a174c86455d4cbe6 100644 (file)
@@ -317,7 +317,7 @@ static bool fcu_test_selected(FCurve *fcu)
 /* helper for recalcData() - for Action Editor transforms */
 static void recalcData_actedit(TransInfo *t)
 {
-       SceneLayer *sl= t->scene_layer;
+       SceneLayer *sl = t->scene_layer;
        SpaceAction *saction = (SpaceAction *)t->sa->spacedata.first;
        
        bAnimContext ac = {NULL};
index f64b0cc2fae75829cb4b78ef5576355d7f816843..c0c7c9220619ce92875ea8223f09b4623d8a7fa5 100644 (file)
@@ -1185,7 +1185,7 @@ static void WIDGETGROUP_manipulator_setup(const bContext *UNUSED(C), wmManipulat
                /* custom handler! */
                WM_manipulator_set_fn_custom_modal(axis, manipulator_modal);
 
-               switch(axis_idx) {
+               switch (axis_idx) {
                        case MAN_AXIS_TRANS_X:
                        case MAN_AXIS_TRANS_Y:
                        case MAN_AXIS_TRANS_Z:
index 55ce45e5e2aca82cf5ea9cb25431a3a39c69bc96..4ff4c3223f06ffef89c8ec3cb1f927fd85bccb18 100644 (file)
@@ -1574,8 +1574,9 @@ static void stitch_draw(const bContext *UNUSED(C), ARegion *UNUSED(ar), void *ar
        UI_GetThemeColor4fv(TH_STITCH_PREVIEW_ACTIVE, col);
        vbo = GWN_vertbuf_create_with_format(&format);
        GWN_vertbuf_data_alloc(vbo, stitch_preview->num_static_tris * 3);
-       for (int i = 0; i < stitch_preview->num_static_tris * 3; i++)
-               GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->static_tris[i*2]);
+       for (int i = 0; i < stitch_preview->num_static_tris * 3; i++) {
+               GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->static_tris[i * 2]);
+       }
        stitch_draw_vbo(vbo, GWN_PRIM_TRIS, col);
 
 
@@ -1601,16 +1602,17 @@ static void stitch_draw(const bContext *UNUSED(C), ARegion *UNUSED(ar), void *ar
 
                for (j = 1; j < stitch_preview->uvs_per_polygon[i] - 1; ++j) {
                        GWN_vertbuf_attr_set(vbo, pos_id, tri_idx++, &stitch_preview->preview_polys[index]);
-                       GWN_vertbuf_attr_set(vbo, pos_id, tri_idx++, &stitch_preview->preview_polys[index + (j+0)*2]);
-                       GWN_vertbuf_attr_set(vbo, pos_id, tri_idx++, &stitch_preview->preview_polys[index + (j+1)*2]);
+                       GWN_vertbuf_attr_set(vbo, pos_id, tri_idx++, &stitch_preview->preview_polys[index + (j + 0) * 2]);
+                       GWN_vertbuf_attr_set(vbo, pos_id, tri_idx++, &stitch_preview->preview_polys[index + (j + 1) * 2]);
 
-                       GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index + (j+0)*2]);
-                       GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index + (j+1)*2]);
+                       GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index + (j + 0) * 2]);
+                       GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index + (j + 1) * 2]);
                }
 
                /* Closing line */
                GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index]);
-               GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index + j*2]); /* j = uvs_per_polygon[i] - 1*/
+               /* j = uvs_per_polygon[i] - 1*/
+               GWN_vertbuf_attr_set(vbo_line, pos_id, line_idx++, &stitch_preview->preview_polys[index + j * 2]);
 
                index += stitch_preview->uvs_per_polygon[i] * 2;
        }
@@ -1629,30 +1631,34 @@ static void stitch_draw(const bContext *UNUSED(C), ARegion *UNUSED(ar), void *ar
                UI_GetThemeColor4fv(TH_STITCH_PREVIEW_STITCHABLE, col);
                vbo = GWN_vertbuf_create_with_format(&format);
                GWN_vertbuf_data_alloc(vbo, stitch_preview->num_stitchable);
-               for (int i = 0; i < stitch_preview->num_stitchable; i++)
-                       GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_stitchable[i*2]);
+               for (int i = 0; i < stitch_preview->num_stitchable; i++) {
+                       GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_stitchable[i * 2]);
+               }
                stitch_draw_vbo(vbo, GWN_PRIM_POINTS, col);
 
                UI_GetThemeColor4fv(TH_STITCH_PREVIEW_UNSTITCHABLE, col);
                vbo = GWN_vertbuf_create_with_format(&format);
                GWN_vertbuf_data_alloc(vbo, stitch_preview->num_unstitchable);
-               for (int i = 0; i < stitch_preview->num_unstitchable; i++)
-                       GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_unstitchable[i*2]);
+               for (int i = 0; i < stitch_preview->num_unstitchable; i++) {
+                       GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_unstitchable[i * 2]);
+               }
                stitch_draw_vbo(vbo, GWN_PRIM_POINTS, col);
        }
        else {
                UI_GetThemeColor4fv(TH_STITCH_PREVIEW_STITCHABLE, col);
                vbo = GWN_vertbuf_create_with_format(&format);
                GWN_vertbuf_data_alloc(vbo, stitch_preview->num_stitchable * 2);
-               for (int i = 0; i < stitch_preview->num_stitchable * 2; i++)
-                       GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_stitchable[i*2]);
+               for (int i = 0; i < stitch_preview->num_stitchable * 2; i++) {
+                       GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_stitchable[i * 2]);
+               }
                stitch_draw_vbo(vbo, GWN_PRIM_LINES, col);
 
                UI_GetThemeColor4fv(TH_STITCH_PREVIEW_UNSTITCHABLE, col);
                vbo = GWN_vertbuf_create_with_format(&format);
                GWN_vertbuf_data_alloc(vbo, stitch_preview->num_unstitchable * 2);
-               for (int i = 0; i < stitch_preview->num_unstitchable * 2; i++)
-                       GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_unstitchable[i*2]);
+               for (int i = 0; i < stitch_preview->num_unstitchable * 2; i++) {
+                       GWN_vertbuf_attr_set(vbo, pos_id, i, &stitch_preview->preview_unstitchable[i * 2]);
+               }
                stitch_draw_vbo(vbo, GWN_PRIM_LINES, col);
        }
 }
index 27d1d1f902e29f93e21108d989a78db59e6d0a8b..6d16092996e3ad6c41f0d5592199d3b0ccde7306 100644 (file)
@@ -39,7 +39,7 @@
 #include "GPU_shader.h"
 
 /* Extend GWN_batch_program_set to use Blender’s library of built-in shader programs. */
-void GWN_batch_program_set_builtin(Gwn_Batch*, GPUBuiltinShader);
+void GWN_batch_program_set_builtin(Gwn_Batch *, GPUBuiltinShader);
 
 /* Replacement for gluSphere */
 Gwn_Batch *GPU_batch_preset_sphere(int lod);
index 5bb9fe950991b25c471c1ba5c08954a45ffb74c1..12ed67cdf4e7c98c21e3a422f3c61a3a96b980c6 100644 (file)
@@ -281,7 +281,7 @@ GPUFX *GPU_fx_compositor_create(void)
        }
        Gwn_VertBuf *vbo = GWN_vertbuf_create_with_format(&format);
        GWN_vertbuf_data_alloc(vbo, 4);
-       for (int i = 0; i < 4; ++i)     {
+       for (int i = 0; i < 4; ++i) {
                GWN_vertbuf_attr_set(vbo, pos, i, fullscreencos[i]);
                GWN_vertbuf_attr_set(vbo, uvs, i, fullscreenuvs[i]);
        }
index 1ab1cba2504b74357cfbcbe55446de05d6c00fd9..cc6afe983caae70be4176e11287735a40f4a6567 100644 (file)
@@ -1280,7 +1280,7 @@ void GPU_create_smoke(SmokeModifierData *smd, int highres)
                        }
                        sds->tex_flame = (smoke_turbulence_has_fuel(sds->wt)) ?
                                          GPU_texture_create_3D_custom(sds->res_wt[0], sds->res_wt[1], sds->res_wt[2], 1,
-                                                                      GPU_R8, smoke_turbulence_get_flame(sds->wt), NULL):
+                                                                      GPU_R8, smoke_turbulence_get_flame(sds->wt), NULL) :
                                          NULL;
                }
 
@@ -2425,7 +2425,8 @@ void gpuPushAttrib(eGPUAttribMask mask)
        AttribStack.top++;
 }
 
-static void restore_mask(GLenum cap, const bool value) {
+static void restore_mask(GLenum cap, const bool value)
+{
        if (value) {
                glEnable(cap);
        }
index e7b70b70d805b702c9bb351a2e7896d17475a291..6b19cea464b71daa5a452f9da7c5dbcd497e4a02 100644 (file)
@@ -573,7 +573,7 @@ void GPU_framebuffer_recursive_downsample(
                glReadBuffer(GL_COLOR_ATTACHMENT0);
        }
 
-       for (i=1; i < num_iter+1 && (current_dim[0] > 4 && current_dim[1] > 4); i++) {
+       for (i = 1; i < num_iter + 1 && (current_dim[0] > 4 && current_dim[1] > 4); i++) {
 
                /* calculate next viewport size */
                current_dim[0] /= 2;
@@ -587,8 +587,8 @@ void GPU_framebuffer_recursive_downsample(
 
                /* bind next level for rendering but first restrict fetches only to previous level */
                GPU_texture_bind(tex, 0);
-               glTexParameteri(GPU_texture_target(tex), GL_TEXTURE_BASE_LEVEL, i-1);
-               glTexParameteri(GPU_texture_target(tex), GL_TEXTURE_MAX_LEVEL, i-1);
+               glTexParameteri(GPU_texture_target(tex), GL_TEXTURE_BASE_LEVEL, i - 1);
+               glTexParameteri(GPU_texture_target(tex), GL_TEXTURE_MAX_LEVEL, i - 1);
                GPU_texture_unbind(tex);
 
                glFramebufferTexture(GL_FRAMEBUFFER, attachment, GPU_texture_opengl_bindcode(tex), i);
@@ -601,7 +601,7 @@ void GPU_framebuffer_recursive_downsample(
        /* reset mipmap level range for the depth image */
        GPU_texture_bind(tex, 0);
        glTexParameteri(GPU_texture_target(tex), GL_TEXTURE_BASE_LEVEL, 0);
-       glTexParameteri(GPU_texture_target(tex), GL_TEXTURE_MAX_LEVEL, i-1);
+       glTexParameteri(GPU_texture_target(tex), GL_TEXTURE_MAX_LEVEL, i - 1);
        GPU_texture_unbind(tex);
 }
 
index 23bfb1dfb6b1fc67a55524edf6047172989c1988..fbc1ace1292835abffa35a147f4c78fe3d96007e 100644 (file)
@@ -376,7 +376,7 @@ GPULamp *GPU_lamp_from_blender(Scene *scene, Object *ob, Object *par)
 
 void GPU_lamp_engine_data_free(LampEngineData *led)
 {
-       for (int i = 0; i < MAX_LAMP_DATA; ++i) {
+       for (int i = 0; i < MAX_LAMP_DATA; ++i) {
                if (led->storage[i]) {
                        MEM_freeN(led->storage[i]);
                        led->storage[i] = NULL;
index 11575d8062c5b86602d698fc701c5673bb487c79..b6214f2778b9112d180f25b37bf5bf0aec397860 100644 (file)
@@ -574,33 +574,33 @@ void gpuBindMatrices(const Gwn_ShaderInterface *shaderface)
        const Gwn_ShaderInput *P_inv = GWN_shaderinterface_uniform_builtin(shaderface, GWN_UNIFORM_PROJECTION_INV);
 
        if (MV) {
-               #if DEBUG_MATRIX_BIND
+#if DEBUG_MATRIX_BIND
                puts("setting MV matrix");
-               #endif
+#endif
 
                glUniformMatrix4fv(MV->location, 1, GL_FALSE, (const float *)gpuGetModelViewMatrix(NULL));
        }
 
        if (P) {
-               #if DEBUG_MATRIX_BIND
+#if DEBUG_MATRIX_BIND
                puts("setting P matrix");
-               #endif
+#endif
 
                glUniformMatrix4fv(P->location, 1, GL_FALSE, (const float *)gpuGetProjectionMatrix(NULL));
        }
 
        if (MVP) {
-               #if DEBUG_MATRIX_BIND
+#if DEBUG_MATRIX_BIND
                puts("setting MVP matrix");
-               #endif
+#endif
 
                glUniformMatrix4fv(MVP->location, 1, GL_FALSE, (const float *)gpuGetModelViewProjectionMatrix(NULL));
        }
 
        if (N) {
-               #if DEBUG_MATRIX_BIND
+#if DEBUG_MATRIX_BIND
                puts("setting normal matrix");
-               #endif
+#endif
 
                glUniformMatrix3fv(N->location, 1, GL_FALSE, (const float *)gpuGetNormalMatrix(NULL));
        }
@@ -609,14 +609,14 @@ void gpuBindMatrices(const Gwn_ShaderInterface *shaderface)
                Mat4 m;
                gpuGetModelViewMatrix(m);
                invert_m4(m);
-               glUniformMatrix4fv(MV_inv->location, 1, GL_FALSE, (const float*) m);
+               glUniformMatrix4fv(MV_inv->location, 1, GL_FALSE, (const float *)m);
        }
 
        if (P_inv) {
                Mat4 m;
                gpuGetProjectionMatrix(m);
                invert_m4(m);
-               glUniformMatrix4fv(P_inv->location, 1, GL_FALSE, (const float*) m);
+               glUniformMatrix4fv(P_inv->location, 1, GL_FALSE, (const float *)m);
        }
 
        state.dirty = false;
index 733aafd7362021bab1d9ff9d2047a5bd62529730..66049b1d2a16220ea801c3ee718adc72a631123f 100644 (file)
@@ -727,7 +727,7 @@ GPUShader *GPU_shader_get_builtin_shader(GPUBuiltinShader shader)
                [GPU_SHADER_2D_IMAGE_SHUFFLE_COLOR] = { datatoc_gpu_shader_2D_image_vert_glsl,
                                                        datatoc_gpu_shader_image_shuffle_color_frag_glsl },
                [GPU_SHADER_3D_UNIFORM_COLOR] = { datatoc_gpu_shader_3D_vert_glsl, datatoc_gpu_shader_uniform_color_frag_glsl },
-           [GPU_SHADER_3D_UNIFORM_COLOR_U32] = { datatoc_gpu_shader_3D_vert_glsl, datatoc_gpu_shader_uniform_color_frag_glsl },
+               [GPU_SHADER_3D_UNIFORM_COLOR_U32] = { datatoc_gpu_shader_3D_vert_glsl, datatoc_gpu_shader_uniform_color_frag_glsl },
                [GPU_SHADER_3D_FLAT_COLOR] = { datatoc_gpu_shader_3D_flat_color_vert_glsl,
                                               datatoc_gpu_shader_flat_color_frag_glsl },
                [GPU_SHADER_3D_FLAT_COLOR_U32] = { datatoc_gpu_shader_3D_flat_color_vert_glsl,
index 3defbe1e55f13b2764bbdb7562111d7576276e8a..6d52dab5a1f22b45a9d3c52c9e896df4f080c399 100644 (file)
@@ -243,8 +243,8 @@ static GPUType get_padded_gpu_type(LinkData *link)
 
        /* Unless the vec3 is followed by a float we need to treat it as a vec4. */
        if (gputype == GPU_VEC3 &&
-               (link->next != NULL) &&
-               (((GPUInput *)link->next->data)->type != GPU_FLOAT))
+           (link->next != NULL) &&
+           (((GPUInput *)link->next->data)->type != GPU_FLOAT))
        {
                gputype = GPU_VEC4;
        }
@@ -368,7 +368,8 @@ int GPU_uniformbuffer_bindpoint(GPUUniformBuffer *ubo)
        return ubo->bindpoint;
 }
 
-void GPU_uniformbuffer_tag_dirty(GPUUniformBuffer *ubo_) {
+void GPU_uniformbuffer_tag_dirty(GPUUniformBuffer *ubo_)
+{
        BLI_assert(ubo_->type == GPU_UBO_DYNAMIC);
        GPUUniformBufferDynamic *ubo = (GPUUniformBufferDynamic *)ubo_;
        ubo->flag |= GPU_UBO_FLAG_DIRTY;
index bf255cfef6f7b5ba507bee9b840a12e45a093e8b..058f6ced40bf2c04e408c9b441a6f16ad0b5a818 100644 (file)
@@ -238,8 +238,8 @@ GPUTexture *GPU_viewport_texture_pool_query(GPUViewport *viewport, void *engine,
 
        for (ViewportTempTexture *tmp_tex = viewport->tex_pool.first; tmp_tex; tmp_tex = tmp_tex->next) {
                if ((GPU_texture_width(tmp_tex->texture) == width) &&
-                       (GPU_texture_height(tmp_tex->texture) == height) &&
-                       (GPU_texture_format(tmp_tex->texture) == format))
+                   (GPU_texture_height(tmp_tex->texture) == height) &&
+                   (GPU_texture_format(tmp_tex->texture) == format))
                {
                        /* Search if the engine is not already using this texture */
                        for (int i = 0; i < MAX_ENGINE_BUFFER_SHARING; ++i) {
index 6043224df5d80fdaf087a44ce78f3a1111149dfb..88a1873c17fe82360432cb8420f249f64acaf9a9 100644 (file)
@@ -42,7 +42,6 @@
 
 #include "BLI_iterator.h"
 #include "BKE_report.h"
-#include "DNA_object_types.h"
 
 #include "DEG_depsgraph_build.h"
 #include "DEG_depsgraph_debug.h"
@@ -266,7 +265,7 @@ static void rna_def_depsgraph_iter(BlenderRNA *brna)
        prop = RNA_def_property(srna, "persistent_id", PROP_INT, PROP_NONE);
        RNA_def_property_ui_text(prop, "Persistent ID",
                                 "Persistent identifier for inter-frame matching of objects with motion blur");
-       RNA_def_property_array(prop, 2*MAX_DUPLI_RECUR);
+       RNA_def_property_array(prop, 2 * MAX_DUPLI_RECUR);
        RNA_def_property_clear_flag(prop, PROP_ANIMATABLE | PROP_EDITABLE);
        RNA_def_property_int_funcs(prop, "rna_DepsgraphIter_persistent_id_get", NULL, NULL);
 
index a628dade59bf0fba54ccea12c3ef78fc9a2320e3..448d847a959caaffa0402041eb8eecb12be43961 100644 (file)
@@ -37,8 +37,6 @@
 
 #ifdef RNA_RUNTIME
 
-#include "DNA_object_types.h"
-
 #include "MEM_guardedalloc.h"
 
 #include "BKE_main.h"
@@ -47,7 +45,6 @@
 #include "DNA_object_types.h"
 
 #include "WM_api.h"
-#include "WM_types.h"
 
 static void rna_LightProbe_recalc(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
 {
index bd10bbc49eaa48e3a06f0f47641d9635ab49c4ff..c31b70c57eda32634dddd1905cf539d69f3e0438 100644 (file)
@@ -1865,13 +1865,13 @@ void RNA_def_material(BlenderRNA *brna)
 
        prop = RNA_def_property(srna, "transparent_hide_backside", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "blend_flag", MA_BL_HIDE_BACKSIDE);
-       RNA_def_property_ui_text(prop, "Hide Backside" , "Limit transparency to a single layer "
+       RNA_def_property_ui_text(prop, "Hide Backside", "Limit transparency to a single layer "
                                                         "(avoids transparency sorting problems)");
        RNA_def_property_update(prop, 0, "rna_Material_draw_update");
 
        prop = RNA_def_property(srna, "use_screen_refraction", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "blend_flag", MA_BL_SS_REFRACTION);
-       RNA_def_property_ui_text(prop, "Screen Space Refraction" , "Use raytraced screen space refractions");
+       RNA_def_property_ui_text(prop, "Screen Space Refraction", "Use raytraced screen space refractions");
        RNA_def_property_update(prop, 0, "rna_Material_draw_update");
 
        prop = RNA_def_property(srna, "refraction_depth", PROP_FLOAT, PROP_DISTANCE);
index 1234bd9f3677a3b025c04f325872d5e2f3ee9c8d..d1dcfa41e285fa41a12112fa97634eeff515cb26 100644 (file)
@@ -111,13 +111,13 @@ static void rna_Object_select_set(Object *ob, bContext *C, ReportList *reports,
        }
 
        switch (action) {
-           case 1: /* DESELECT */
-                   base->flag &= ~BASE_SELECTED;
-                   break;
-           case 0: /* SELECT */
-           default:
-                   BKE_scene_layer_base_select(sl, base);
-                   break;
+               case 1: /* DESELECT */
+                       base->flag &= ~BASE_SELECTED;
+                       break;
+               case 0: /* SELECT */
+               default:
+                       BKE_scene_layer_base_select(sl, base);
+                       break;
        }
 }
 
index 83e9d55c3dfbd38159ea2a612e0aabdf85cc7b99..8304fa452e40ff435902d9e669dff19d41b679ba 100644 (file)
@@ -401,7 +401,7 @@ static PointerRNA rna_RenderEngine_scene_layer_get(PointerRNA *ptr)
 {
        RenderEngine *engine = (RenderEngine *)ptr->data;
        if (engine->re != NULL) {
-               SceneLayerscene_layer = RE_engine_get_scene_layer(engine->re);
+               SceneLayer *scene_layer = RE_engine_get_scene_layer(engine->re);
                return rna_pointer_inherit_refine(ptr, &RNA_SceneLayer, scene_layer);
        }
        return rna_pointer_inherit_refine(ptr, &RNA_SceneLayer, NULL);
index c7d122280b66073582fe0cd9b8f08ed44fbf6272..59d0792eb1ef026ce4ce6ceca8ae119b83133217 100644 (file)
@@ -471,7 +471,6 @@ EnumPropertyItem rna_enum_layer_collection_mode_settings_type_items[] = {
 #include "BKE_node.h"
 #include "BKE_pointcache.h"
 #include "BKE_scene.h"
-#include "BKE_idprop.h"
 #include "BKE_mesh.h"
 #include "BKE_sound.h"
 #include "BKE_screen.h"
@@ -480,9 +479,6 @@ EnumPropertyItem rna_enum_layer_collection_mode_settings_type_items[] = {
 #include "BKE_freestyle.h"
 #include "BKE_gpencil.h"
 
-#include "DEG_depsgraph.h"
-#include "DEG_depsgraph_build.h"
-
 #include "ED_info.h"
 #include "ED_node.h"
 #include "ED_view3d.h"
@@ -492,6 +488,7 @@ EnumPropertyItem rna_enum_layer_collection_mode_settings_type_items[] = {
 #include "ED_scene.h"
 
 #include "DEG_depsgraph.h"
+#include "DEG_depsgraph_build.h"
 #include "DEG_depsgraph_query.h"
 
 #ifdef WITH_FREESTYLE
@@ -2967,7 +2964,7 @@ static int rna_SceneLayer_objects_selected_skip(CollectionPropertyIterator *iter
        Base *base = (Base *)internal->link;
 
        if ((base->flag & BASE_SELECTED) != 0) {
-                       return 0;
+               return 0;
        }
 
        return 1;
index 3e04a0a8233849ccf9257828ca70f247173dfc31..a8dcd563ed39c5e4b635aa512d6101e8c98812b9 100644 (file)
@@ -41,7 +41,6 @@
 
 #include "rna_internal.h"
 
-#include "WM_api.h"
 #include "WM_types.h"
 
 #ifdef RNA_RUNTIME
@@ -53,7 +52,6 @@
 #include <assert.h>
 
 #include "WM_api.h"
-#include "WM_types.h"
 
 #include "DNA_workspace_types.h"
 
index 27d292ddfa2de4aa661d188b14de2f459c6d551e..c948f84e087490b79fa8888618ae5c19b8db96e9 100644 (file)
@@ -258,7 +258,7 @@ void RNA_api_manipulator(StructRNA *srna)
        func = RNA_def_function(srna, "target_set_operator", "rna_manipulator_target_set_operator");
        RNA_def_function_flag(func, FUNC_USE_REPORTS);
        RNA_def_function_ui_description(
-               func,"Operator to run when activating the manipulator "
+               func, "Operator to run when activating the manipulator "
                "(overrides property targets)");
        parm = RNA_def_string(func, "operator", NULL, 0, "", "Target operator");
        RNA_def_parameter_flags(parm, 0, PARM_REQUIRED);
index aacb14094bc4f16d82e0949703a309edf6c37bd0..3ef85e8ae0ffd895bf5bba1a5cef1e35543e5637 100644 (file)
@@ -18,8 +18,8 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __GWN_PY_API__
-#define __GWN_PY_API__
+#ifndef __GWN_PY_API_H__
+#define __GWN_PY_API_H__
 
 /** \file blender/python/gawain/gwn_py_api.h
  *  \ingroup pygawain
@@ -27,4 +27,4 @@
 
 PyObject *BPyInit_gawain(void);
 
-#endif  /* __GWN_PY_API__ */
+#endif  /* __GWN_PY_API_H__ */
index ef032a6e9359b6eaa53147cfca6c235acde31b7f..cc448d9ed9018eb626619c60d553be57e27b078c 100644 (file)
@@ -647,7 +647,7 @@ static PyObject *bpygwn_VertBatch_uniform_f32(BPyGwn_Batch *self, PyObject *args
                return NULL;
        }
 
-       switch(PyTuple_GET_SIZE(args)) {
+       switch (PyTuple_GET_SIZE(args)) {
                case 2: GWN_batch_uniform_1f(self->batch,  params.id,  params.values[0]); break;
                case 3: GWN_batch_uniform_2fv(self->batch, params.id, params.values);     break;
                case 4: GWN_batch_uniform_3fv(self->batch, params.id, params.values);     break;
index 1e63a0e4483f937c37943b51d2f6df1b40bbc379..c0800705b289c3c67763ede912fe4d6398070e0f 100644 (file)
@@ -85,13 +85,13 @@ static void wm_method_draw_stereo3d_pageflip(wmWindow *win)
 static GPUInterlaceShader interlace_gpu_id_from_type(eStereo3dInterlaceType interlace_type)
 {
        switch (interlace_type) {
-           case S3D_INTERLACE_ROW:
-                   return GPU_SHADER_INTERLACE_ROW;
-           case S3D_INTERLACE_COLUMN:
-                   return GPU_SHADER_INTERLACE_COLUMN;
-           case S3D_INTERLACE_CHECKERBOARD:
-           default:
-                   return GPU_SHADER_INTERLACE_CHECKER;
+               case S3D_INTERLACE_ROW:
+                       return GPU_SHADER_INTERLACE_ROW;
+               case S3D_INTERLACE_COLUMN:
+                       return GPU_SHADER_INTERLACE_COLUMN;
+               case S3D_INTERLACE_CHECKERBOARD:
+               default:
+                       return GPU_SHADER_INTERLACE_CHECKER;
        }
 }
 
index a3a01b36ec1ed430348eb85fdc071ca68b2821e5..09b2b50687a463d5b22b4cc37aa3dee64641d14e 100644 (file)
@@ -1967,7 +1967,7 @@ void WM_window_set_active_workspace(wmWindow *win, WorkSpace *workspace)
 WorkSpaceLayout *WM_window_get_active_layout(const wmWindow *win)
 {
        const WorkSpace *workspace = WM_window_get_active_workspace(win);
-       return (LIKELY(workspace != NULL) ? BKE_workspace_active_layout_get(win->workspace_hook): NULL);
+       return (LIKELY(workspace != NULL) ? BKE_workspace_active_layout_get(win->workspace_hook) : NULL);
 }
 void WM_window_set_active_layout(wmWindow *win, WorkSpace *workspace, WorkSpaceLayout *layout)
 {
index 81f627fc7c5cf34dc31795d161179ee93cbf61fa..b4f658073413eda4fddca9bafe181a615b2855b0 100644 (file)
@@ -236,7 +236,7 @@ bool WM_manipulator_target_property_range_get(
                        mpr_prop->custom_func.range_get_fn(mpr, mpr_prop, range);
                        return true;
                }
-               else{
+               else {
                        return false;
 
                }