From 6bb626f2532757873ff2ea9f6d2571cc5f344201 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 21 Apr 2011 05:49:47 +0000 Subject: minor changes - remove some warnings - fix typos - cmake allow in-source build (when WITH_IN_SOURCE_BUILD is defined) - cmake, use an explicit list of rna files (don't glob) --- source/blender/editors/util/crazyspace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/util/crazyspace.c') diff --git a/source/blender/editors/util/crazyspace.c b/source/blender/editors/util/crazyspace.c index 8008d76344d..a2b32ec7cf8 100644 --- a/source/blender/editors/util/crazyspace.c +++ b/source/blender/editors/util/crazyspace.c @@ -400,7 +400,7 @@ void crazyspace_build_sculpt(Scene *scene, Object *ob, float (**deformmats)[3][3 if(!modifier_isEnabled(scene, md, eModifierMode_Realtime)) continue; if(mti->type==eModifierTypeType_OnlyDeform) { - /* skip leading modifiers which have been alredy + /* skip leading modifiers which have been already handled in sculpt_get_first_deform_matrices */ if(mti->deformMatrices && !deformed) continue; -- cgit v1.2.3 From d000103e80c076fb5bbdfbc87dc978b5e693564d Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 4 May 2011 13:15:42 +0000 Subject: Own TODO item: sculpting on constructive modifiers - Constructive modifiers are enabled by default in sculpt mode. - There's option to disable all constructive modifiers in the "Options" panel of toolbox in sculpt mode, - Use one column in options panel to make strings easier to read - No modifiers would still be applied on multires --- source/blender/editors/util/crazyspace.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'source/blender/editors/util/crazyspace.c') diff --git a/source/blender/editors/util/crazyspace.c b/source/blender/editors/util/crazyspace.c index a2b32ec7cf8..9560924941d 100644 --- a/source/blender/editors/util/crazyspace.c +++ b/source/blender/editors/util/crazyspace.c @@ -425,4 +425,15 @@ void crazyspace_build_sculpt(Scene *scene, Object *ob, float (**deformmats)[3][3 MEM_freeN(origVerts); MEM_freeN(quats); } + + if(!*deformmats) { + int a, numVerts; + Mesh *me= (Mesh*)ob->data; + + *deformcos= mesh_getVertexCos(me, &numVerts); + *deformmats= MEM_callocN(sizeof(*(*deformmats))*numVerts, "defmats"); + + for(a=0; a