diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-06 10:29:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-06 10:29:54 +0300 |
commit | ab375079df06de112fc7697ebfe626903b7da97e (patch) | |
tree | b4d32e4fde180dfe2da457bef4f9273fa9c762e1 /source | |
parent | 6ff89166a8e9b442f912bbcaa4bbaa9e9d9ea01b (diff) |
Cleanup: rename WITH -> USE for internal defines
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/BKE_mesh_runtime.h | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh_runtime.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/BKE_mesh_runtime.h b/source/blender/blenkernel/BKE_mesh_runtime.h index da11eb81267..6904ad529de 100644 --- a/source/blender/blenkernel/BKE_mesh_runtime.h +++ b/source/blender/blenkernel/BKE_mesh_runtime.h @@ -44,9 +44,9 @@ struct Object; struct Scene; /* Undefine to hide DerivedMesh-based function declarations */ -#define WITH_DERIVEDMESH +#define USE_DERIVEDMESH -#ifdef WITH_DERIVEDMESH +#ifdef USE_DERIVEDMESH struct DerivedMesh; #endif @@ -65,7 +65,7 @@ void BKE_mesh_runtime_verttri_from_looptri( /* NOTE: the functions below are defined in DerivedMesh.c, and are intended to be moved * to a more suitable location when that file is removed. */ -#ifdef WITH_DERIVEDMESH +#ifdef USE_DERIVEDMESH struct DerivedMesh *mesh_get_derived_final( struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, CustomDataMask dataMask); @@ -73,7 +73,7 @@ struct DerivedMesh *mesh_get_derived_final( struct Mesh *mesh_get_eval_final( struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, CustomDataMask dataMask); -#ifdef WITH_DERIVEDMESH +#ifdef USE_DERIVEDMESH struct DerivedMesh *mesh_get_derived_deform( struct Depsgraph *depsgraph, struct Scene *scene, struct Object *ob, CustomDataMask dataMask); diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index e7e434042dd..b0d03fcf8da 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -3105,7 +3105,7 @@ void makeDerivedMesh( /***/ -#ifdef WITH_DERIVEDMESH +#ifdef USE_DERIVEDMESH /* Deprecated DM, use: 'mesh_get_eval_final'. */ DerivedMesh *mesh_get_derived_final( struct Depsgraph *depsgraph, Scene *scene, Object *ob, CustomDataMask dataMask) @@ -3147,7 +3147,7 @@ Mesh *mesh_get_eval_final( return ob->runtime.mesh_eval; } -#ifdef WITH_DERIVEDMESH +#ifdef USE_DERIVEDMESH /* Deprecated DM, use: 'mesh_get_eval_deform' instead. */ DerivedMesh *mesh_get_derived_deform(struct Depsgraph *depsgraph, Scene *scene, Object *ob, CustomDataMask dataMask) { diff --git a/source/blender/blenkernel/intern/mesh_runtime.c b/source/blender/blenkernel/intern/mesh_runtime.c index 2109a465c55..cd9db408d19 100644 --- a/source/blender/blenkernel/intern/mesh_runtime.c +++ b/source/blender/blenkernel/intern/mesh_runtime.c @@ -44,7 +44,7 @@ #include "BKE_mesh.h" #include "BKE_mesh_runtime.h" -#ifdef WITH_DERIVEDMESH +#ifdef USE_DERIVEDMESH #include "BKE_DerivedMesh.h" #endif |