Merged changes in the trunk up to revision 46045.
[blender-staging.git] / source / blender / editors / render / render_shading.c
index 89a8c7b0852730e6b71c452a8d6d61ffa89c930c..903fb87265b1c757725b8f66a5b9c706b539dc5d 100644 (file)
@@ -182,7 +182,7 @@ static int material_slot_assign_exec(bContext *C, wmOperator *UNUSED(op))
                }
                else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
                        Nurb *nu;
-                       ListBase *nurbs = curve_editnurbs((Curve *)ob->data);
+                       ListBase *nurbs = BKE_curve_editNurbs_get((Curve *)ob->data);
 
                        if (nurbs) {
                                for (nu = nurbs->first; nu; nu = nu->next)
@@ -237,7 +237,7 @@ static int material_slot_de_select(bContext *C, int select)
                }
        }
        else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {
-               ListBase *nurbs = curve_editnurbs((Curve *)ob->data);
+               ListBase *nurbs = BKE_curve_editNurbs_get((Curve *)ob->data);
                Nurb *nu;
                BPoint *bp;
                BezTriple *bezt;
@@ -333,7 +333,7 @@ static int material_slot_copy_exec(bContext *C, wmOperator *UNUSED(op))
        if (!ob || !(matar = give_matarar(ob)))
                return OPERATOR_CANCELLED;
 
-       CTX_DATA_BEGIN(C, Object *, ob_iter, selected_editable_objects) {
+       CTX_DATA_BEGIN (C, Object *, ob_iter, selected_editable_objects) {
                if (ob != ob_iter && give_matarar(ob_iter)) {
                        if (ob->data != ob_iter->data)
                                assign_matarar(ob_iter, matar, ob->totcol);