[Bf-blender-cvs] [d594fd6dc5d] sculpt-mode-features: removed some unnecessary disabled code

Martin Felke noreply at git.blender.org
Mon Apr 8 22:09:12 CEST 2019


Commit: d594fd6dc5d55a847c15575c13ded84c33894ddd
Author: Martin Felke
Date:   Mon Apr 8 22:08:34 2019 +0200
Branches: sculpt-mode-features
https://developer.blender.org/rBd594fd6dc5d55a847c15575c13ded84c33894ddd

removed some unnecessary disabled code

===================================================================

M	source/blender/blenkernel/intern/modifier.c
M	source/blender/makesdna/DNA_modifier_types.h

===================================================================

diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c
index c6d1a4043a0..fe955ced5f5 100644
--- a/source/blender/blenkernel/intern/modifier.c
+++ b/source/blender/blenkernel/intern/modifier.c
@@ -157,18 +157,6 @@ void modifier_free_ex(ModifierData *md, const int flag)
 			mti->foreachObjectLink(md, NULL, (ObjectWalkFunc)modifier_free_data_id_us_cb, NULL);
 		}
 	}
-#if 0
-	if (md->type == eModifierType_Remesh)
-	{
-		if ((flag & LIB_ID_CREATE_NO_USER_REFCOUNT) == 0){
-			/* is this a regular free ? */
-			RemeshModifierData *rmd = (RemeshModifierData*)md;
-			if (rmd->shared) {
-				//MEM_freeN(rmd->shared);
-			}
-		}
-	}
-#endif
 
 	if (mti->freeData) mti->freeData(md);
 	if (md->error) MEM_freeN(md->error);
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index deb5629ab61..d43be43ce8e 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -521,7 +521,6 @@ typedef struct UVProjectModifierData {
 } UVProjectModifierData;
 
 #define MOD_UVPROJECT_MAXPROJECTORS 10
-#define MOD_REMESH_MAX_CSG_OPERANDS 20
 
 /* UVProjectModifierData->flags */
 enum {



More information about the Bf-blender-cvs mailing list