Merge branch 'master' into blender2.8
[blender.git] / source / blender / blenkernel / intern / effect.c
index f54082de153e3575612874edde34d5bd176a5b4e..0c8a47be4b4a064c4da76789debce606c6d6da10 100644 (file)
@@ -87,7 +87,7 @@
 #include <string.h>
 #endif // WITH_MOD_FLUID
 
-EffectorWeights *BKE_add_effector_weights(Collection *collection)
+EffectorWeights *BKE_effector_add_weights(Collection *collection)
 {
        EffectorWeights *weights = MEM_callocN(sizeof(EffectorWeights), "EffectorWeights");
        int i;
@@ -102,7 +102,7 @@ EffectorWeights *BKE_add_effector_weights(Collection *collection)
 
        return weights;
 }
-PartDeflect *object_add_collision_fields(int type)
+PartDeflect *BKE_partdeflect_new(int type)
 {
        PartDeflect *pd;
 
@@ -140,7 +140,7 @@ PartDeflect *object_add_collision_fields(int type)
 
 /************************ PARTICLES ***************************/
 
-void free_partdeflect(PartDeflect *pd)
+void BKE_partdeflect_free(PartDeflect *pd)
 {
        if (!pd) {
                return;