[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19796] trunk/blender/source/blender/ blenkernel/intern/modifier.c: Booleans:
Daniel Genrich
daniel.genrich at gmx.net
Sun Apr 19 20:18:52 CEST 2009
Revision: 19796
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19796
Author: genscher
Date: 2009-04-19 20:18:52 +0200 (Sun, 19 Apr 2009)
Log Message:
-----------
Booleans:
- Enable e.g. subsurf before boolean modifier
- Fix editmode crash
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/modifier.c
Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c 2009-04-19 17:47:09 UTC (rev 19795)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2009-04-19 18:18:52 UTC (rev 19796)
@@ -6143,7 +6143,7 @@
DerivedMesh *dm = mesh_get_derived_final(bmd->object, CD_MASK_BAREMESH);
/* we do a quick sanity check */
- if(derivedData->getNumFaces(derivedData) > 3
+ if(dm && (derivedData->getNumFaces(derivedData) > 3)
&& bmd->object && dm->getNumFaces(dm) > 3) {
DerivedMesh *result = NewBooleanDerivedMesh(dm, bmd->object, derivedData, ob,
1 + bmd->operation);
@@ -8326,7 +8326,6 @@
mti = INIT_TYPE(Boolean);
mti->type = eModifierTypeType_Nonconstructive;
mti->flags = eModifierTypeFlag_AcceptsMesh
- | eModifierTypeFlag_RequiresOriginalData
| eModifierTypeFlag_UsesPointCache;
mti->copyData = booleanModifier_copyData;
mti->isDisabled = booleanModifier_isDisabled;
More information about the Bf-blender-cvs
mailing list