diff options
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_DerivedMesh.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_cloth.h | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_global.h | 18 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_layer.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/BKE_modifier.h | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/CCGSubSurf.h | 2 |
6 files changed, 4 insertions, 36 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index 8c1dc77964a..7bb4142b237 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -95,7 +95,7 @@ struct Depsgraph; struct PBVH; /* number of sub-elements each mesh element has (for interpolation) */ -#define SUB_ELEMS_VERT 0 +// #define SUB_ELEMS_VERT 0 /* UNUSED */ #define SUB_ELEMS_EDGE 2 #define SUB_ELEMS_FACE 50 diff --git a/source/blender/blenkernel/BKE_cloth.h b/source/blender/blenkernel/BKE_cloth.h index 87094e77953..13cba949361 100644 --- a/source/blender/blenkernel/BKE_cloth.h +++ b/source/blender/blenkernel/BKE_cloth.h @@ -153,17 +153,11 @@ typedef struct ClothSpring { ClothSpring; // some macro enhancements for vector treatment -#define VECADDADD(v1,v2,v3) {*(v1)+= *(v2) + *(v3); *(v1+1)+= *(v2+1) + *(v3+1); *(v1+2)+= *(v2+2) + *(v3+2);} -#define VECSUBADD(v1,v2,v3) {*(v1)-= *(v2) + *(v3); *(v1+1)-= *(v2+1) + *(v3+1); *(v1+2)-= *(v2+2) + *(v3+2);} -#define VECADDSUB(v1,v2,v3) {*(v1)+= *(v2) - *(v3); *(v1+1)+= *(v2+1) - *(v3+1); *(v1+2)+= *(v2+2) - *(v3+2);} #define VECSUBADDSS(v1,v2,aS,v3,bS) {*(v1)-= *(v2)*aS + *(v3)*bS; *(v1+1)-= *(v2+1)*aS + *(v3+1)*bS; *(v1+2)-= *(v2+2)*aS + *(v3+2)*bS;} -#define VECADDSUBSS(v1,v2,aS,v3,bS) {*(v1)+= *(v2)*aS - *(v3)*bS; *(v1+1)+= *(v2+1)*aS - *(v3+1)*bS; *(v1+2)+= *(v2+2)*aS - *(v3+2)*bS;} #define VECADDSS(v1,v2,aS,v3,bS) {*(v1)= *(v2)*aS + *(v3)*bS; *(v1+1)= *(v2+1)*aS + *(v3+1)*bS; *(v1+2)= *(v2+2)*aS + *(v3+2)*bS;} #define VECADDS(v1,v2,v3,bS) {*(v1)= *(v2) + *(v3)*bS; *(v1+1)= *(v2+1) + *(v3+1)*bS; *(v1+2)= *(v2+2) + *(v3+2)*bS;} #define VECSUBMUL(v1,v2,aS) {*(v1)-= *(v2) * aS; *(v1+1)-= *(v2+1) * aS; *(v1+2)-= *(v2+2) * aS;} #define VECSUBS(v1,v2,v3,bS) {*(v1)= *(v2) - *(v3)*bS; *(v1+1)= *(v2+1) - *(v3+1)*bS; *(v1+2)= *(v2+2) - *(v3+2)*bS;} -#define VECSUBSB(v1,v2, v3,bS) {*(v1)= (*(v2)- *(v3))*bS; *(v1+1)= (*(v2+1) - *(v3+1))*bS; *(v1+2)= (*(v2+2) - *(v3+2))*bS;} -#define VECMULS(v1,aS) {*(v1)*= aS; *(v1+1)*= aS; *(v1+2)*= *aS;} #define VECADDMUL(v1,v2,aS) {*(v1)+= *(v2) * aS; *(v1+1)+= *(v2+1) * aS; *(v1+2)+= *(v2+2) * aS;} /* SIMULATION FLAGS: goal flags,.. */ diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index c2981128ab8..0b1a45028c1 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -172,20 +172,8 @@ enum { #define G_FILE_USERPREFS (1 << 9) #define G_FILE_NO_UI (1 << 10) -#ifdef DNA_DEPRECATED_ALLOW -/* #define G_FILE_GAME_TO_IPO (1 << 11) */ /* deprecated */ -#define G_FILE_GAME_MAT (1 << 12) /* deprecated */ -/* #define G_FILE_DISPLAY_LISTS (1 << 13) */ /* deprecated */ -#define G_FILE_SHOW_PHYSICS (1 << 14) /* deprecated */ -#define G_FILE_GAME_MAT_GLSL (1 << 15) /* deprecated */ -/* #define G_FILE_GLSL_NO_LIGHTS (1 << 16) */ /* deprecated */ -#define G_FILE_GLSL_NO_SHADERS (1 << 17) /* deprecated */ -#define G_FILE_GLSL_NO_SHADOWS (1 << 18) /* deprecated */ -#define G_FILE_GLSL_NO_RAMPS (1 << 19) /* deprecated */ -#define G_FILE_GLSL_NO_NODES (1 << 20) /* deprecated */ -#define G_FILE_GLSL_NO_EXTRA_TEX (1 << 21) /* deprecated */ -#define G_FILE_IGNORE_DEPRECATION_WARNINGS (1 << 22) /* deprecated */ -#endif /* DNA_DEPRECATED_ALLOW */ + +/* Bits 11 to 22 (inclusive) are deprecated & need to be cleared */ /* On read, use #FileGlobal.filename instead of the real location on-disk, * needed for recovering temp files so relative paths resolve */ @@ -198,7 +186,7 @@ enum { // #define G_FILE_MESH_COMPAT (1 << 26) /* On write, restore paths after editing them (G_FILE_RELATIVE_REMAP) */ #define G_FILE_SAVE_COPY (1 << 27) -#define G_FILE_GLSL_NO_ENV_LIGHTING (1 << 28) +/* #define G_FILE_GLSL_NO_ENV_LIGHTING (1 << 28) */ /* deprecated */ #define G_FILE_FLAGS_RUNTIME (G_FILE_NO_UI | G_FILE_RELATIVE_REMAP | G_FILE_SAVE_COPY) diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index 746733e4e0e..8e4ce9988ec 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -40,8 +40,6 @@ extern "C" { #define TODO_LAYER_OPERATORS /* collection mamanger and property panel operators */ #define TODO_LAYER /* generic todo */ -#define ROOT_PROP "root" - struct Base; struct Collection; struct Depsgraph; diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index 9504eff7dec..c228e56e88d 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -426,16 +426,6 @@ void modwrap_deformVertsEM( struct BMEditMesh *em, struct Mesh *me, float (*vertexCos)[3], int numVerts); -#define applyModifier_DM_wrapper(NEW_FUNC_NAME, OLD_FUNC_NAME) \ - static Mesh *NEW_FUNC_NAME(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh) \ - { \ - DerivedMesh *dm = CDDM_from_mesh_ex(mesh, CD_REFERENCE, CD_MASK_EVERYTHING); \ - DerivedMesh *ndm = OLD_FUNC_NAME(md, ctx, dm); \ - if (ndm != dm) dm->release(dm); \ - DM_to_mesh(ndm, mesh, ctx->object, CD_MASK_EVERYTHING, true); \ - return mesh; \ - } - /* wrappers for modifier callbacks that accept Mesh and select the proper implementation * depending on if the modifier has been ported to Mesh or is still using DerivedMesh */ diff --git a/source/blender/blenkernel/intern/CCGSubSurf.h b/source/blender/blenkernel/intern/CCGSubSurf.h index 8cdbd2a7a98..e8ed186a8a1 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.h +++ b/source/blender/blenkernel/intern/CCGSubSurf.h @@ -71,8 +71,6 @@ typedef enum { /***/ -#define CCG_OMP_LIMIT 1000000 - /* TODO(sergey): This actually depends on subsurf level as well. */ #define CCG_TASK_LIMIT 16 |