svn merge ^/trunk/blender -r43294:43338
[blender.git] / source / blender / editors / transform / transform_generics.c
index b6f75fe1b48c49d76b18c5b13f3621968b619d09..e917b7d4c966fff10c80f6b956a9cf197b42748e 100644 (file)
@@ -1078,7 +1078,7 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
                if(v3d->flag & V3D_ALIGN) t->flag |= T_V3D_ALIGN;
                t->around = v3d->around;
                
-               if (op && RNA_struct_find_property(op->ptr, "constraint_orientation") && RNA_property_is_set(op->ptr, "constraint_orientation"))
+               if (op && RNA_struct_find_property(op->ptr, "constraint_orientation") && RNA_struct_property_is_set(op->ptr, "constraint_orientation"))
                {
                        t->current_orientation = RNA_enum_get(op->ptr, "constraint_orientation");
                        
@@ -1101,7 +1101,7 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
 
                /* initialize UV transform from */
                if (op && RNA_struct_find_property(op->ptr, "correct_uv")) {
-                       if(RNA_property_is_set(op->ptr, "correct_uv")) {
+                       if(RNA_struct_property_is_set(op->ptr, "correct_uv")) {
                                if(RNA_boolean_get(op->ptr, "correct_uv")) {
                                        t->settings->uvcalc_flag |= UVCALC_TRANSFORM_CORRECT;
                                }
@@ -1147,7 +1147,7 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
                t->around = V3D_CENTER;
        }
        
-       if (op && RNA_property_is_set(op->ptr, "release_confirm"))
+       if (op && RNA_struct_property_is_set(op->ptr, "release_confirm"))
        {
                if (RNA_boolean_get(op->ptr, "release_confirm"))
                {
@@ -1162,7 +1162,7 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
                }
        }
 
-       if (op && RNA_struct_find_property(op->ptr, "mirror") && RNA_property_is_set(op->ptr, "mirror"))
+       if (op && RNA_struct_find_property(op->ptr, "mirror") && RNA_struct_property_is_set(op->ptr, "mirror"))
        {
                if (RNA_boolean_get(op->ptr, "mirror"))
                {
@@ -1183,7 +1183,7 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
        /* setting PET flag only if property exist in operator. Otherwise, assume it's not supported */
        if (op && RNA_struct_find_property(op->ptr, "proportional"))
        {
-               if (RNA_property_is_set(op->ptr, "proportional"))
+               if (RNA_struct_property_is_set(op->ptr, "proportional"))
                {
                        switch(RNA_enum_get(op->ptr, "proportional"))
                        {
@@ -1216,7 +1216,7 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
                        }
                }
                
-               if (op && RNA_struct_find_property(op->ptr, "proportional_size") && RNA_property_is_set(op->ptr, "proportional_size"))
+               if (op && RNA_struct_find_property(op->ptr, "proportional_size") && RNA_struct_property_is_set(op->ptr, "proportional_size"))
                {
                        t->prop_size = RNA_float_get(op->ptr, "proportional_size");
                }
@@ -1233,7 +1233,7 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
                        t->prop_size = 1.0f;
                }
                
-               if (op && RNA_struct_find_property(op->ptr, "proportional_edit_falloff") && RNA_property_is_set(op->ptr, "proportional_edit_falloff"))
+               if (op && RNA_struct_find_property(op->ptr, "proportional_edit_falloff") && RNA_struct_property_is_set(op->ptr, "proportional_edit_falloff"))
                {
                        t->prop_mode = RNA_enum_get(op->ptr, "proportional_edit_falloff");
                }