remove BM_ITER, BM_ITER_INDEX macros, use ELEM or MESH variants only (the maceros...
[blender-staging.git] / source / blender / editors / render / render_shading.c
index 6e2a83c13bb9330b3bc357302884707db4d9a980..6722ac5e68669ce28be0832a9e1ae95c06b22fa4 100644 (file)
@@ -170,8 +170,7 @@ static int material_slot_assign_exec(bContext *C, wmOperator *UNUSED(op))
                        BMIter iter;
 
                        if (em) {
-                               BM_ITER(efa, &iter, em->bm, BM_FACES_OF_MESH, NULL)
-                               {
+                               BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
                                        if (BM_elem_flag_test(efa, BM_ELEM_SELECT))
                                                efa->mat_nr = ob->actcol - 1;
                                }
@@ -588,9 +587,9 @@ static int texture_slot_move(bContext *C, wmOperator *op)
                                mtex_ar[act] = mtex_ar[act - 1];
                                mtex_ar[act - 1] = mtexswap;
                                
-                               BKE_animdata_fix_paths_rename(id, adt, "texture_slots", NULL, NULL, act - 1, -1, 0);
-                               BKE_animdata_fix_paths_rename(id, adt, "texture_slots", NULL, NULL, act, act - 1, 0);
-                               BKE_animdata_fix_paths_rename(id, adt, "texture_slots", NULL, NULL, -1, act, 0);
+                               BKE_animdata_fix_paths_rename(id, adt, NULL, "texture_slots", NULL, NULL, act - 1, -1, 0);
+                               BKE_animdata_fix_paths_rename(id, adt, NULL, "texture_slots", NULL, NULL, act, act - 1, 0);
+                               BKE_animdata_fix_paths_rename(id, adt, NULL, "texture_slots", NULL, NULL, -1, act, 0);
 
                                if (GS(id->name) == ID_MA) {
                                        Material *ma = (Material *)id;
@@ -610,9 +609,9 @@ static int texture_slot_move(bContext *C, wmOperator *op)
                                mtex_ar[act] = mtex_ar[act + 1];
                                mtex_ar[act + 1] = mtexswap;
                                
-                               BKE_animdata_fix_paths_rename(id, adt, "texture_slots", NULL, NULL, act + 1, -1, 0);
-                               BKE_animdata_fix_paths_rename(id, adt, "texture_slots", NULL, NULL, act, act + 1, 0);
-                               BKE_animdata_fix_paths_rename(id, adt, "texture_slots", NULL, NULL, -1, act, 0);
+                               BKE_animdata_fix_paths_rename(id, adt, NULL, "texture_slots", NULL, NULL, act + 1, -1, 0);
+                               BKE_animdata_fix_paths_rename(id, adt, NULL, "texture_slots", NULL, NULL, act, act + 1, 0);
+                               BKE_animdata_fix_paths_rename(id, adt, NULL, "texture_slots", NULL, NULL, -1, act, 0);
 
                                if (GS(id->name) == ID_MA) {
                                        Material *ma = (Material *)id;