rename RNA_property_is_set() --> RNA_struct_property_is_set() in preperation to add...
[blender.git] / source / blender / editors / curve / editcurve.c
index 762564c1cc9c2d23ae643de8e4cbd4301d3d6c40..aea6f5c43b6e0630d3c49ece88eea32bb7cd821f 100644 (file)
@@ -1069,17 +1069,17 @@ static void curve_rename_fcurves(Object *obedit, ListBase *orig_curves)
                        while (a--) {
                                keyIndex= getCVKeyIndex(editnurb, bezt);
                                if(keyIndex) {
-                                       sprintf(rna_path, "splines[%d].bezier_points[%d]", nu_index, pt_index);
-                                       sprintf(orig_rna_path, "splines[%d].bezier_points[%d]", keyIndex->nu_index, keyIndex->pt_index);
+                                       BLI_snprintf(rna_path, sizeof(rna_path), "splines[%d].bezier_points[%d]", nu_index, pt_index);
+                                       BLI_snprintf(orig_rna_path, sizeof(orig_rna_path), "splines[%d].bezier_points[%d]", keyIndex->nu_index, keyIndex->pt_index);
 
                                        if(keyIndex->switched) {
                                                char handle_path[64], orig_handle_path[64];
-                                               sprintf(orig_handle_path, "%s.handle_left", orig_rna_path);
-                                               sprintf(handle_path, "%s.handle_right", rna_path);
+                                               BLI_snprintf(orig_handle_path, sizeof(orig_rna_path), "%s.handle_left", orig_rna_path);
+                                               BLI_snprintf(handle_path, sizeof(rna_path), "%s.handle_right", rna_path);
                                                fcurve_path_rename(ad, orig_handle_path, handle_path, orig_curves, &curves);
 
-                                               sprintf(orig_handle_path, "%s.handle_right", orig_rna_path);
-                                               sprintf(handle_path, "%s.handle_left", rna_path);
+                                               BLI_snprintf(orig_handle_path, sizeof(orig_rna_path), "%s.handle_right", orig_rna_path);
+                                               BLI_snprintf(handle_path, sizeof(rna_path), "%s.handle_left", rna_path);
                                                fcurve_path_rename(ad, orig_handle_path, handle_path, orig_curves, &curves);
                                        }
 
@@ -1100,8 +1100,8 @@ static void curve_rename_fcurves(Object *obedit, ListBase *orig_curves)
                        while (a--) {
                                keyIndex= getCVKeyIndex(editnurb, bp);
                                if(keyIndex) {
-                                       sprintf(rna_path, "splines[%d].points[%d]", nu_index, pt_index);
-                                       sprintf(orig_rna_path, "splines[%d].points[%d]", keyIndex->nu_index, keyIndex->pt_index);
+                                       BLI_snprintf(rna_path, sizeof(rna_path), "splines[%d].points[%d]", nu_index, pt_index);
+                                       BLI_snprintf(orig_rna_path, sizeof(orig_rna_path), "splines[%d].points[%d]", keyIndex->nu_index, keyIndex->pt_index);
                                        fcurve_path_rename(ad, orig_rna_path, rna_path, orig_curves, &curves);
 
                                        keyIndex->nu_index= nu_index;
@@ -1140,8 +1140,8 @@ static void curve_rename_fcurves(Object *obedit, ListBase *orig_curves)
                }
 
                if(keyIndex) {
-                       sprintf(rna_path, "splines[%d]", nu_index);
-                       sprintf(orig_rna_path, "splines[%d]", keyIndex->nu_index);
+                       BLI_snprintf(rna_path, sizeof(rna_path), "splines[%d]", nu_index);
+                       BLI_snprintf(orig_rna_path, sizeof(orig_rna_path), "splines[%d]", keyIndex->nu_index);
                        fcurve_path_rename(ad, orig_rna_path, rna_path, orig_curves, &curves);
                }
 
@@ -4636,7 +4636,7 @@ static int add_vertex_invoke(bContext *C, wmOperator *op, wmEvent *event)
 {
        RegionView3D *rv3d= CTX_wm_region_view3d(C);
 
-       if(rv3d && !RNA_property_is_set(op->ptr, "location")) {
+       if(rv3d && !RNA_struct_property_is_set(op->ptr, "location")) {
                Curve *cu;
                ViewContext vc;
                float location[3];