Fix build for MSVC: Remove trailing double semicolon
authorDalai Felinto <dfelinto@gmail.com>
Thu, 20 Sep 2018 14:47:10 +0000 (14:47 +0000)
committerDalai Felinto <dfelinto@gmail.com>
Thu, 20 Sep 2018 14:59:55 +0000 (14:59 +0000)
Not sure why but MSVC is complaining for some of those.

In particular for the struct in BKE_subdiv_ccg.h. Those were the ones
crashing here..

13 files changed:
source/blender/blenkernel/BKE_subdiv_ccg.h
source/blender/blenkernel/intern/constraint.c
source/blender/draw/engines/eevee/eevee_effects.c
source/blender/draw/engines/eevee/eevee_private.h
source/blender/draw/engines/gpencil/gpencil_draw_utils.c
source/blender/editors/armature/armature_select.c
source/blender/editors/mesh/editmesh_add_gizmo.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_outliner/outliner_collections.c
source/blender/gpu/intern/gpu_framebuffer.c
source/blender/gpu/intern/gpu_material.c
source/blender/makesrna/intern/rna_wm.c
source/blender/modifiers/intern/MOD_laplaciandeform.c

index ac90c5f7db31265b4f51cb5df384330c33752d0e..cee7bce7f056e4d8124cac73e665af3170cb513a 100644 (file)
@@ -153,7 +153,7 @@ typedef struct SubdivCCG {
        /* Vertices which are adjacent to faces
         * Used for faster grid stitching, in the cost of extra memory.
         */
-       int num_adjacent_vertices;;
+       int num_adjacent_vertices;
        SubdivCCGAdjacentVertex *adjacent_vertices;
 
        struct DMFlagMat *grid_flag_mats;
index 4674b2c75541d0ee52541769f7d06e805975fc14..188559d4b14b99de060443d612032a5a917a15ab 100644 (file)
@@ -3974,7 +3974,7 @@ static void followtrack_evaluate(bConstraint *con, bConstraintOb *cob, ListBase
                                 depsgraph,
                                 data->camera ? data->camera : scene->camera);
 
-       float ctime = DEG_get_ctime(depsgraph);;
+       float ctime = DEG_get_ctime(depsgraph);
        float framenr;
 
        if (data->flag & FOLLOWTRACK_ACTIVECLIP)
index bb3938fe2c306282863ebb6f0aa738a2c2039afb..fe71558f74a560ca1df260a3aeff404cb81f6625 100644 (file)
@@ -561,7 +561,7 @@ void EEVEE_draw_effects(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata)
        /* Update double buffer status if render mode. */
        if (DRW_state_is_image_render()) {
                stl->g_data->valid_double_buffer = (txl->color_double_buffer != NULL);
-               stl->g_data->valid_taa_history = (txl->taa_history != NULL);;
+               stl->g_data->valid_taa_history = (txl->taa_history != NULL);
        }
 }
 
index 62db134a117016002039fe3dc235bbd1a710d596..35a1211ba4a11e449fc66f63e58fc3deb85191cc 100644 (file)
@@ -933,7 +933,7 @@ void EEVEE_motion_blur_free(void);
 
 /* eevee_mist.c */
 void EEVEE_mist_output_init(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata);
-void EEVEE_mist_output_accumulate(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata);;
+void EEVEE_mist_output_accumulate(EEVEE_ViewLayerData *sldata, EEVEE_Data *vedata);
 void EEVEE_mist_free(void);
 
 /* eevee_temporal_sampling.c */
index 39ab49cde28be2b2d733935024789770199a8cf8..516c27ae21ddb17d15eb268b2cda3b2b1e44fd3b 100644 (file)
@@ -477,7 +477,7 @@ static DRWShadingGroup *DRW_gpencil_shgroup_point_create(
 
        /* object scale and depth */
        if ((ob) && (id > -1)) {
-               stl->shgroups[id].obj_scale = mat4_to_scale(ob->obmat);;
+               stl->shgroups[id].obj_scale = mat4_to_scale(ob->obmat);
                DRW_shgroup_uniform_float(grp, "objscale", &stl->shgroups[id].obj_scale, 1);
                stl->shgroups[id].keep_size = (int)((gpd) && (gpd->flag & GP_DATA_STROKE_KEEPTHICKNESS));
                DRW_shgroup_uniform_int(grp, "keep_size", &stl->shgroups[id].keep_size, 1);
index bccc8c795b3678c7fb1e248e81513870c8279231..95b9e1dafcf1cf2d1a4a6076c0dd9a48a48dc152 100644 (file)
@@ -129,7 +129,7 @@ Base *ED_armature_base_and_bone_from_select_buffer(
        if (base != NULL) {
                if (base->object->pose != NULL) {
                        const uint hit_bone = (hit & ~BONESEL_ANY) >> 16;
-                       bPoseChannel *pchan = BLI_findlink(&base->object->pose->chanbase, hit_bone);;
+                       bPoseChannel *pchan = BLI_findlink(&base->object->pose->chanbase, hit_bone);
                        bone = pchan ? pchan->bone : NULL;
                }
        }
index 253f546c7af20538e3a0b4da40f07816d02a6f2e..7437d86e6b5374c9884c8cad3fbc0ed6fb2721a8 100644 (file)
@@ -321,7 +321,7 @@ static void MESH_GGT_add_bounds(struct wmGizmoGroupType *gzgt)
 
 static int add_primitive_cube_gizmo_exec(bContext *C, wmOperator *op)
 {
-       Object *obedit = CTX_data_edit_object(C);;
+       Object *obedit = CTX_data_edit_object(C);
        BMEditMesh *em = BKE_editmesh_from_object(obedit);
        float matrix[4][4];
 
index b6be0959e9da56326afdea76a4be8af0ed34ebda..951949e18c6e5faf139f69b86bd4c3e94cd23212 100644 (file)
@@ -4755,7 +4755,7 @@ static void SCREEN_OT_workspace_cycle(wmOperatorType *ot)
 
        /* api callbacks */
        ot->invoke = space_workspace_cycle_invoke;
-       ot->poll = ED_operator_screenactive;;
+       ot->poll = ED_operator_screenactive;
 
        ot->flag = 0;
 
index f0feb7515ba5c01d7b5daca7bdc75dbf44a6f4ac..c1d86da3eab0d6a46e8291534f807657dfefb1a2 100644 (file)
@@ -226,7 +226,7 @@ void OUTLINER_OT_collection_new(wmOperatorType *ot)
        ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
 
        /* properties */
-       PropertyRNA *prop = RNA_def_boolean(ot->srna, "nested", true, "Nested", "Add as child of selected collection");;
+       PropertyRNA *prop = RNA_def_boolean(ot->srna, "nested", true, "Nested", "Add as child of selected collection");
        RNA_def_property_flag(prop, PROP_SKIP_SAVE);
 }
 
index ab96efe540a5a86fd60a9d45e1d26efbfebfac7c..270dc014f7bce3ffd0f691027e6daa872286db2d 100644 (file)
@@ -198,7 +198,7 @@ GPUFrameBuffer *GPU_framebuffer_create(void)
 {
        /* We generate the FB object later at first use in order to
         * create the framebuffer in the right opengl context. */
-       return MEM_callocN(sizeof(GPUFrameBuffer), "GPUFrameBuffer");;
+       return MEM_callocN(sizeof(GPUFrameBuffer), "GPUFrameBuffer");
 }
 
 static void gpu_framebuffer_init(GPUFrameBuffer *fb)
index a7eb533d9ef1c2a3b58ec8f90315c54d9e22263c..d5aa7177e11c20a2b7769419b09cf1f21ebd296e 100644 (file)
@@ -654,7 +654,7 @@ GPUMaterial *GPU_material_from_nodetree(
        BLI_assert(GPU_material_from_nodetree_find(gpumaterials, engine_type, options) == NULL);
 
        /* allocate material */
-       GPUMaterial *mat = MEM_callocN(sizeof(GPUMaterial), "GPUMaterial");;
+       GPUMaterial *mat = MEM_callocN(sizeof(GPUMaterial), "GPUMaterial");
        mat->scene = scene;
        mat->engine_type = engine_type;
        mat->options = options;
index fd0759bfe4234bff4a0e365a52bc045f9910ba83..7ceaa769d78625568375053768bee521b0cf1d60 100644 (file)
@@ -779,7 +779,7 @@ static void rna_workspace_screen_update(bContext *C, PointerRNA *ptr)
 static PointerRNA rna_Window_view_layer_get(PointerRNA *ptr)
 {
        wmWindow *win = ptr->data;
-       Scene *scene = WM_window_get_active_scene(win);;
+       Scene *scene = WM_window_get_active_scene(win);
        ViewLayer *view_layer = WM_window_get_active_view_layer(win);
        PointerRNA scene_ptr;
 
index cb04c38902c518b3502fb471905bf55e2ab5a34f..92ccf7feaa03e53f8f51b0454b4cb83652b16c7d 100644 (file)
@@ -566,7 +566,7 @@ static void initSystem(
 
 
                mlooptri = BKE_mesh_runtime_looptri_ensure(mesh);
-               mloop = mesh->mloop;;
+               mloop = mesh->mloop;
 
                for (i = 0; i < sys->total_tris; i++) {
                        sys->tris[i][0] = mloop[mlooptri[i].tri[0]].v;