style cleanup
authorCampbell Barton <ideasman42@gmail.com>
Sun, 14 Oct 2012 13:08:19 +0000 (13:08 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 14 Oct 2012 13:08:19 +0000 (13:08 +0000)
23 files changed:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/boids.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_regions.c
source/blender/editors/space_buttons/buttons_ops.c
source/blender/editors/space_outliner/outliner_tools.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/gpu/intern/gpu_material.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_access.c
source/blender/modifiers/intern/MOD_wave.c
source/blender/render/intern/raytrace/rayobject_octree.cpp
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/intern/wm_event_system.c
source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp

index f24b58658f6eaba2a2b4922445e1f880a506e91b..d4e7f09b5f1bd87b341e10b973a0250722b09d6f 100644 (file)
@@ -193,8 +193,8 @@ set(SRC
        BKE_lamp.h
        BKE_lattice.h
        BKE_library.h
-       BKE_mask.h
        BKE_main.h
+       BKE_mask.h
        BKE_material.h
        BKE_mball.h
        BKE_mesh.h
index b87342f85fa8960442f5273b6ee6e19d9df07208..6eb1daa1e4fd6f1cb844c72a5fca2d12b7d303be 100644 (file)
@@ -534,10 +534,12 @@ Mat4 *b_bone_spline_setup(bPoseChannel *pchan, int rest)
                mul_m4_v3(imat, h2);
 
                /* if next bone is B-bone too, use average handle direction */
-               if (next->bone->segments > 1)
-                       ;
-               else
+               if (next->bone->segments > 1) {
+                       /* pass */
+               }
+               else {
                        h2[1] -= length;
+               }
                normalize_v3(h2);
 
                /* find the next roll to interpolate as well */
index 79d5e092a1015ac771b82217735b888673883a63..aafc7fe89b46af75994658f07e94dc50157e4147 100644 (file)
@@ -101,13 +101,15 @@ static int rule_goal_avoid(BoidRule *rule, BoidBrainData *bbd, BoidValues *val,
                                break;
                        }
                }
-               else if (rule->type == eBoidRuleType_Goal && eob == bpa->ground)
-                       ; /* skip current object */
+               else if (rule->type == eBoidRuleType_Goal && eob == bpa->ground) {
+                       /* skip current object */
+               }
                else if (pd->forcefield == PFIELD_BOID && mul * pd->f_strength > 0.0f && get_effector_data(cur, &cur_efd, &epoint, 0)) {
                        float temp = mul * pd->f_strength * effector_falloff(cur, &cur_efd, &epoint, bbd->part->effector_weights);
 
-                       if (temp == 0.0f)
-                               ; /* do nothing */
+                       if (temp == 0.0f) {
+                               /* do nothing */
+                       }
                        else if (temp > priority) {
                                priority = temp;
                                eff = cur;
index a9571406b7eb314b45842c99761acf8cd5c5cfeb..7c0b43c24df6ec600c8c1b3e2cded6fffe51705b 100644 (file)
@@ -1013,10 +1013,12 @@ void pdDoEffectors(ListBase *effectors, ListBase *colliders, EffectorWeights *we
                                if (efd.falloff > 0.0f)
                                        efd.falloff *= eff_calc_visibility(colliders, eff, &efd, point);
 
-                               if (efd.falloff <= 0.0f)
-                                       ;       /* don't do anything */
-                               else if (eff->pd->forcefield == PFIELD_TEXTURE)
+                               if (efd.falloff <= 0.0f) {
+                                       /* don't do anything */
+                               }
+                               else if (eff->pd->forcefield == PFIELD_TEXTURE) {
                                        do_texture_effector(eff, &efd, point, force);
+                               }
                                else {
                                        float temp1[3]={0, 0, 0}, temp2[3];
                                        copy_v3_v3(temp1, force);
index 6b90ec88362559372af9216864ab318fee34e054..84301972ddf3286852d5c87c29bae2698cb90f37 100644 (file)
@@ -3328,8 +3328,9 @@ void BKE_ptcache_load_external(PTCacheID *pid)
                cache->endframe = end;
                cache->totpoint = 0;
 
-               if (pid->type == PTCACHE_TYPE_SMOKE_DOMAIN)
-                       ; /*necessary info in every file*/
+               if (pid->type == PTCACHE_TYPE_SMOKE_DOMAIN) {
+                       /* necessary info in every file */
+               }
                /* read totpoint from info file (frame 0) */
                else if (info) {
                        pf= ptcache_file_open(pid, PTCACHE_FILE_READ, 0);
index 1e14eb55dc0cc4390fe21ad8d526beec6428d3ce..884a6432ddaf11b17172354872a53dc048849e8e 100644 (file)
@@ -4319,10 +4319,12 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb)
                                if (smd->domain->ptcaches[1].first || smd->domain->point_cache[1]) {
                                        if (smd->domain->point_cache[1]) {
                                                PointCache *cache = newdataadr(fd, smd->domain->point_cache[1]);
-                                               if (cache->flag & PTCACHE_FAKE_SMOKE)
-                                                       ; /* Smoke was already saved in "new format" and this cache is a fake one. */
-                                               else
+                                               if (cache->flag & PTCACHE_FAKE_SMOKE) {
+                                                       /* Smoke was already saved in "new format" and this cache is a fake one. */
+                                               }
+                                               else {
                                                        printf("High resolution smoke cache not available due to pointcache update. Please reset the simulation.\n");
+                                               }
                                                BKE_ptcache_free(cache);
                                        }
                                        smd->domain->ptcaches[1].first = NULL;
index a825cf4ef988cea2c2a0e7a3c74bbc4726bda183..b73485add3db1f1831d1897642aa79b0314a8d92 100644 (file)
@@ -730,8 +730,9 @@ static void write_nodetree(WriteData *wd, bNodeTree *ntree)
                                write_curvemapping(wd, node->storage);
                        else if (ntree->type==NTREE_TEXTURE && (node->type==TEX_NODE_CURVE_RGB || node->type==TEX_NODE_CURVE_TIME) )
                                write_curvemapping(wd, node->storage);
-                       else if (ntree->type==NTREE_COMPOSIT && node->type==CMP_NODE_MOVIEDISTORTION)
-                               /* pass */;
+                       else if (ntree->type==NTREE_COMPOSIT && node->type==CMP_NODE_MOVIEDISTORTION) {
+                               /* pass */
+                       }
                        else
                                writestruct(wd, DATA, node->typeinfo->storagename, 1, node->storage);
                }
index d442ce1b04bf03f02d20b7215807339092cf3861..fcde4186778e6aeaaf6cfb104710aa2e90b71faa 100644 (file)
@@ -1528,7 +1528,9 @@ void ui_set_but_val(uiBut *but, double value)
                 * so leave this unset */
                value = UI_BUT_VALUE_UNSET;
        }
-       else if (but->pointype == 0) ;
+       else if (but->pointype == 0) {
+               /* pass */
+       }
        else if (but->type == HSVSLI) {
                float *fp, hsv[3];
                
@@ -1721,8 +1723,9 @@ void ui_get_but_string(uiBut *but, char *str, size_t maxlen)
                BLI_strncpy(str, but->poin, maxlen);
                return;
        }
-       else if (ui_but_anim_expression_get(but, str, maxlen))
-               ;  /* driver expression */
+       else if (ui_but_anim_expression_get(but, str, maxlen)) {
+               /* driver expression */
+       }
        else {
                /* number editing */
                double value;
@@ -2480,7 +2483,9 @@ static void ui_block_do_align_but(uiBut *first, short nr)
                                if (rows > 0) {
                                        uiBut *bt = but;
                                        while (bt && bt->alignnr == nr) {
-                                               if (bt->next && bt->next->alignnr == nr && buts_are_horiz(bt, bt->next) == 0) break;
+                                               if (bt->next && bt->next->alignnr == nr && buts_are_horiz(bt, bt->next) == 0) {
+                                                       break;
+                                               }
                                                bt = bt->next;
                                        }
                                        if (bt == NULL || bt->alignnr != nr) flag = UI_BUT_ALIGN_TOP | UI_BUT_ALIGN_RIGHT;
@@ -2714,9 +2719,8 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, const char *str,
        }
 
        /* keep track of UI_interface.h */
-       if (ELEM7(but->type, BLOCK, BUT, LABEL, PULLDOWN, ROUNDBOX, LISTBOX, BUTM)) ;
-       else if (ELEM(but->type, SCROLL, SEPR /* , FTPREVIEW */ )) ;
-       else if (but->type >= SEARCH_MENU) ;
+       if      (ELEM9(but->type, BLOCK, BUT, LABEL, PULLDOWN, ROUNDBOX, LISTBOX, BUTM, SCROLL, SEPR /* , FTPREVIEW */)) {}
+       else if (but->type >= SEARCH_MENU) {}
        else but->flag |= UI_BUT_UNDO;
 
        BLI_addtail(&block->buttons, but);
@@ -2750,7 +2754,7 @@ static uiBut *ui_def_but(uiBlock *block, int type, int retval, const char *str,
 
 
 static uiBut *ui_def_but_rna(uiBlock *block, int type, int retval, const char *str,
-                                                        int x, int y, short width, short height,
+                             int x, int y, short width, short height,
                              PointerRNA *ptr, PropertyRNA *prop, int index,
                              float min, float max, float a1, float a2,  const char *tip)
 {
index f798f0b399bf17ae4258cc58811d14dc78798e2a..80c15ad7b4bc0abe09363b66ea74116c17163a26 100644 (file)
@@ -6621,7 +6621,9 @@ static int ui_handle_menu_event(bContext *C, wmEvent *event, uiPopupBlockHandle
                                }
                        }
 
-                       if (menu->menuretval) ;
+                       if (menu->menuretval) {
+                               /* pass */
+                       }
                        else if (event->type == ESCKEY && event->val == KM_PRESS) {
                                /* esc cancels this and all preceding menus */
                                menu->menuretval = UI_RETURN_CANCEL;
index 4dafb4b2d4bbb292ddae7388bdb5a310bcb48daf..14cb1cbe85a63e6f1cde04d3b4d54eed5354b83d 100644 (file)
@@ -2674,14 +2674,18 @@ void uiPupMenuReports(bContext *C, ReportList *reports)
        ds = BLI_dynstr_new();
 
        for (report = reports->list.first; report; report = report->next) {
-               if (report->type < reports->printlevel)
-                       ;  /* pass */
-               else if (report->type >= RPT_ERROR)
+               if (report->type < reports->printlevel) {
+                       /* pass */
+               }
+               else if (report->type >= RPT_ERROR) {
                        BLI_dynstr_appendf(ds, "Error %%i%d%%t|%s", ICON_ERROR, report->message);
-               else if (report->type >= RPT_WARNING)
+               }
+               else if (report->type >= RPT_WARNING) {
                        BLI_dynstr_appendf(ds, "Warning %%i%d%%t|%s", ICON_ERROR, report->message);
-               else if (report->type >= RPT_INFO)
+               }
+               else if (report->type >= RPT_INFO) {
                        BLI_dynstr_appendf(ds, "Info %%i%d%%t|%s", ICON_INFO, report->message);
+               }
        }
 
        str = BLI_dynstr_get_cstring(ds);
index c8cf69e3e17ecb5e51d5fd9ce51b0745b4337ab9..9a7284de66057e786e3fe343eeb2794aa837a173 100644 (file)
@@ -207,7 +207,7 @@ static int file_browse_invoke(bContext *C, wmOperator *op, wmEvent *event)
                 * user-prefs exception - campbell */
                if (RNA_struct_find_property(op->ptr, "relative_path")) {
                        if (!RNA_struct_property_is_set(op->ptr, "relative_path")) {
-                               /* annoying exception!, if were dealign with the user prefs, default relative to be off */
+                               /* annoying exception!, if were dealing with the user prefs, default relative to be off */
                                RNA_boolean_set(op->ptr, "relative_path", U.flag & USER_RELPATHS && (ptr.data != &U));
                        }
                }
index 09df1d57b2b2d1778c205933518c4c8d2c6e2aa4..9b689c359bcd537af79662f75a651706a7a04206 100644 (file)
@@ -1274,12 +1274,15 @@ static int do_outliner_operation_event(bContext *C, Scene *scene, ARegion *ar, S
                        else {
                                if (datalevel == TSE_ANIM_DATA)
                                        WM_operator_name_call(C, "OUTLINER_OT_animdata_operation", WM_OP_INVOKE_REGION_WIN, NULL);
-                               else if (datalevel == TSE_DRIVER_BASE)
-                                       /* do nothing... no special ops needed yet */;
-                               else if (ELEM3(datalevel, TSE_R_LAYER_BASE, TSE_R_LAYER, TSE_R_PASS))
-                                       /*WM_operator_name_call(C, "OUTLINER_OT_renderdata_operation", WM_OP_INVOKE_REGION_WIN, NULL)*/;
-                               else
+                               else if (datalevel == TSE_DRIVER_BASE) {
+                                       /* do nothing... no special ops needed yet */
+                               }
+                               else if (ELEM3(datalevel, TSE_R_LAYER_BASE, TSE_R_LAYER, TSE_R_PASS)) {
+                                       /*WM_operator_name_call(C, "OUTLINER_OT_renderdata_operation", WM_OP_INVOKE_REGION_WIN, NULL)*/
+                               }
+                               else {
                                        WM_operator_name_call(C, "OUTLINER_OT_data_operation", WM_OP_INVOKE_REGION_WIN, NULL);
+                               }
                        }
                }
                
@@ -1301,11 +1304,13 @@ static int outliner_operation(bContext *C, wmOperator *UNUSED(op), wmEvent *even
        SpaceOops *soops = CTX_wm_space_outliner(C);
        TreeElement *te;
        float fmval[2];
-       
+
        UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], fmval, fmval + 1);
        
        for (te = soops->tree.first; te; te = te->next) {
-               if (do_outliner_operation_event(C, scene, ar, soops, te, event, fmval)) break;
+               if (do_outliner_operation_event(C, scene, ar, soops, te, event, fmval)) {
+                       break;
+               }
        }
        
        return OPERATOR_FINISHED;
index 9fd7cfafae0340f6593b58a44ab8325c3d597c14..c30adf844a8da7618bfa2ee1d8d36fa40fb914fb 100644 (file)
@@ -888,9 +888,10 @@ static void view3d_lasso_select(bContext *C, ViewContext *vc,
                        do_lasso_select_paintface(vc, mcords, moves, extend, select);
                else if (paint_vertsel_test(ob))
                        do_lasso_select_paintvert(vc, mcords, moves, extend, select);
-               else if (ob && ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT))
-                       ;
-               else if (ob && ob->mode & OB_MODE_PARTICLE_EDIT)
+               else if (ob && (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT))) {
+                       /* pass */
+               }
+               else if (ob && (ob->mode & OB_MODE_PARTICLE_EDIT))
                        PE_lasso_select(C, mcords, moves, extend, select);
                else {
                        do_lasso_select_objects(vc, mcords, moves, extend, select);
index e582643519780d8ced74969253d9da7208b69e96..6b69fc53162ce6d773805b0636f841c5374545e7 100644 (file)
@@ -772,13 +772,15 @@ static int nearest_uv_between(BMEditMesh *em, BMFace *efa, int UNUSED(nverts), i
        BM_ITER_ELEM (l, &iter, efa, BM_LOOPS_OF_FACE) {
                luv = CustomData_bmesh_get(&em->bm->ldata, l->head.data, CD_MLOOPUV);
                
-               if (i == id1)
+               if (i == id1) {
                        uv1 = luv->uv;
-               else if (i == id)
-                       ;  /* uv2 = luv->uv; */ /* UNUSED */
-               else if (i == id2)
+               }
+               else if (i == id) {
+                       /* uv2 = luv->uv; */ /* UNUSED */
+               }
+               else if (i == id2) {
                        uv3 = luv->uv;
-
+               }
                i++;
        }
 
index e035f1c3f5a921ba8c86ba90bac80caeb5e572ab..e5f08d38ce83985f19953e46606dab21a1fb9ea3 100644 (file)
@@ -780,7 +780,9 @@ static void shade_one_light(GPUShadeInput *shi, GPUShadeResult *shr, GPULamp *la
                }
        }
 
-       if (mat->scene->gm.flag & GAME_GLSL_NO_SHADERS);
+       if (mat->scene->gm.flag & GAME_GLSL_NO_SHADERS) {
+               /* pass */
+       }
        else if (!(lamp->mode & LA_NO_SPEC) && !(lamp->mode & LA_ONLYSHADOW) &&
                 (GPU_link_changed(shi->spec) || ma->spec != 0.0f))
        {
index 079f2768352c6c7b9763488d80195ccf3beaabed..674a7d7a2fedcea0b73a8fcabc02038ad0b28e77 100644 (file)
@@ -1094,7 +1094,9 @@ static int make_structDNA(char *baseDirectory, FILE *file)
                        int a;
                        
                        fp = fopen("padding.c", "w");
-                       if (fp == NULL) ;
+                       if (fp == NULL) {
+                               /* pass */
+                       }
                        else {
 
                                /* add all include files defined in the global array */
index 14c996800fc6f9671416a84ae6ba1068183958ef..fb4e739b8abdc9351585e7f60153488aa9983b61 100644 (file)
@@ -1102,8 +1102,8 @@ static char *rna_def_property_lookup_int_func(FILE *f, StructRNA *srna, Property
                        return NULL;
 
                /* only supported in case of standard next functions */
-               if (strcmp(nextfunc, "rna_iterator_array_next") == 0) ;
-               else if (strcmp(nextfunc, "rna_iterator_listbase_next") == 0) ;
+               if (strcmp(nextfunc, "rna_iterator_array_next") == 0) {}
+               else if (strcmp(nextfunc, "rna_iterator_listbase_next") == 0) {}
                else return NULL;
        }
 
@@ -1372,9 +1372,12 @@ static void rna_def_property_funcs(FILE *f, StructRNA *srna, PropertyDefRNA *dp)
                        CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop;
                        const char *nextfunc = (const char *)cprop->next;
 
-                       if (dp->dnatype && strcmp(dp->dnatype, "ListBase") == 0) ;
-                       else if (dp->dnalengthname || dp->dnalengthfixed)
+                       if (dp->dnatype && strcmp(dp->dnatype, "ListBase") == 0) {
+                               /* pass */
+                       }
+                       else if (dp->dnalengthname || dp->dnalengthfixed) {
                                cprop->length = (void *)rna_def_property_length_func(f, srna, prop, dp, (const char *)cprop->length);
+                       }
 
                        /* test if we can allow raw array access, if it is using our standard
                         * array get/next function, we can be sure it is an actual array */
index c88944b4584861953b303229461d1146647119dc..090fda157253ade209c7f9f098723f79f606e2e6 100644 (file)
@@ -3606,7 +3606,7 @@ static char *rna_path_token(const char **path, char *fixedbuf, int fixedlen, int
        /* copy string, taking into account escaped ] */
        if (bracket) {
                for (p = *path, i = 0, j = 0; i < len; i++, p++) {
-                       if (*p == '\\' && *(p + 1) == quote) ;
+                       if (*p == '\\' && *(p + 1) == quote) {}
                        else buf[j++] = *p;
                }
 
index 440d2c157feb65316e37658f1416be25df2fa922..b713f56a4c2804875eafa0add8e491d5c9b7555b 100644 (file)
@@ -186,7 +186,7 @@ static void waveModifier_do(WaveModifierData *md,
        const float falloff = wmd->falloff;
        float falloff_fac = 1.0f; /* when falloff == 0.0f this stays at 1.0f */
 
-       if (wmd->flag & MOD_WAVE_NORM && ob->type == OB_MESH)
+       if ((wmd->flag & MOD_WAVE_NORM) && (ob->type == OB_MESH))
                mvert = dm->getVertArray(dm);
 
        if (wmd->objectcenter) {
index 5ae716ac9422fc8c45648a05b4caca158e1a72d3..77e9dc9d8fd40afa9bacb5be8f25dbe570a2584a 100644 (file)
@@ -382,8 +382,12 @@ static void d2dda(Octree *oc, short b1, short b2, short c1, short c2, char *ocfa
        
        while (TRUE) {
                
-               if (x < 0 || y < 0 || x >= oc->ocres || y >= oc->ocres) ;
-               else ocface[oc->ocres * x + y] = 1;
+               if (x < 0 || y < 0 || x >= oc->ocres || y >= oc->ocres) {
+                       /* pass*/
+               }
+               else {
+                       ocface[oc->ocres * x + y] = 1;
+               }
                
                labdao = labda;
                if (labdax == labday) {
index 46ab3aeb21ff00006caf76a43f3bf663d2bcf99d..f23bc44d21f9346409b64b7b68a390d5049ddf56 100644 (file)
@@ -4712,10 +4712,12 @@ void RE_Database_Free(Render *re)
 static int allow_render_object(Render *re, Object *ob, int nolamps, int onlyselected, Object *actob)
 {
        /* override not showing object when duplis are used with particles */
-       if (ob->transflag & OB_DUPLIPARTS)
-               ; /* let particle system(s) handle showing vs. not showing */
-       else if ((ob->transflag & OB_DUPLI) && !(ob->transflag & OB_DUPLIFRAMES))
+       if (ob->transflag & OB_DUPLIPARTS) {
+               /* pass */  /* let particle system(s) handle showing vs. not showing */
+       }
+       else if ((ob->transflag & OB_DUPLI) && !(ob->transflag & OB_DUPLIFRAMES)) {
                return 0;
+       }
        
        /* don't add non-basic meta objects, ends up having renderobjects with no geometry */
        if (ob->type == OB_MBALL && ob!=BKE_mball_basis_find(re->scene, ob))
index ef9e25e0fef9fc844737d6da4ebd6bc00d7b6fa6..8114eb651fbdf89530346086ee5d6c609c52ae89 100644 (file)
@@ -887,8 +887,9 @@ static int wm_operator_invoke(bContext *C, wmOperatorType *ot, wmEvent *event,
                        wm_operator_reports(C, op, retval, (reports != NULL));
                }
 
-               if (retval & OPERATOR_HANDLED)
-                       ;  /* do nothing, wm_operator_exec() has been called somewhere */
+               if (retval & OPERATOR_HANDLED) {
+                       /* do nothing, wm_operator_exec() has been called somewhere */
+               }
                else if (retval & OPERATOR_FINISHED) {
                        if (!is_nested_call) { /* not called by py script */
                                WM_operator_last_properties_store(op);
index 4af1753c2da4e528bf14f58b00eca16b91480807..ddadd97b5671da6f33806a361e7447e013946294 100644 (file)
@@ -254,12 +254,18 @@ bool RAS_IPolyMaterial::UsesLighting(RAS_IRasterizer *rasty) const
 {
        bool dolights = false;
 
-       if (m_flag & RAS_BLENDERMAT)
-               dolights = (m_flag &RAS_MULTILIGHT)!=0;
-       else if (rasty->GetDrawingMode() < RAS_IRasterizer::KX_SOLID);
-       else if (rasty->GetDrawingMode() == RAS_IRasterizer::KX_SHADOW);
-       else
+       if (m_flag & RAS_BLENDERMAT) {
+               dolights = (m_flag & RAS_MULTILIGHT) != 0;
+       }
+       else if (rasty->GetDrawingMode() < RAS_IRasterizer::KX_SOLID) {
+               /* pass */
+       }
+       else if (rasty->GetDrawingMode() == RAS_IRasterizer::KX_SHADOW) {
+               /* pass */
+       }
+       else {
                dolights = m_light;
+       }
        
        return dolights;
 }