Revision: 27657
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27657
Author: blendix
Date: 2010-03-22 12:59:36 +0100 (Mon, 22 Mar 2010)
Log Message:
-----------
Sculpt Mode Bugfixes:
* #20833: layer brush doesn't work with multires.
* #20946: sculpt mode partially removes parts of the mesh in the viewport.
* #20420: grab brush stops after moving some distance.
* #20906: sculpt grab tool moves in wrong direction.
* #21132 and #21272: undo on object with subdivision surface modifier crashes.
* #21115: subsurf + multires + sculpting + undo causes crash.
* #20683: sculpt + multires apply + undo crash.
* #19094: wrong outline in solid mode.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_view3d_toolbar.py
trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
trunk/blender/source/blender/blenkernel/BKE_paint.h
trunk/blender/source/blender/blenkernel/BKE_subsurf.h
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/modifier.c
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/makesdna/DNA_screen_types.h
trunk/blender/source/blender/windowmanager/intern/wm_draw.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_gesture.c
trunk/blender/source/blender/windowmanager/wm_draw.h
Modified: trunk/blender/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d_toolbar.py 2010-03-22
09:55:58 UTC (rev 27656)
+++ trunk/blender/release/scripts/ui/space_view3d_toolbar.py 2010-03-22
11:59:36 UTC (rev 27657)
@@ -568,9 +568,18 @@
col.prop(brush, "use_accumulate")
if brush.sculpt_tool == 'LAYER':
- col.prop(brush, "use_persistent")
- col.operator("sculpt.set_persistent_base")
+ ob = context.sculpt_object
+ do_persistent = True
+ # not supported yet for this case
+ for md in ob.modifiers:
+ if md.type == 'MULTIRES':
+ do_persistent = False
+
+ if do_persistent:
+ col.prop(brush, "use_persistent")
+ col.operator("sculpt.set_persistent_base")
+
# Texture Paint Mode #
elif context.texture_paint_object and brush:
Modified: trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2010-03-22
09:55:58 UTC (rev 27656)
+++ trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2010-03-22
11:59:36 UTC (rev 27657)
@@ -227,7 +227,7 @@
*
* Also called for *final* editmode DerivedMeshes
*/
- void (*drawEdges)(DerivedMesh *dm, int drawLooseEdges);
+ void (*drawEdges)(DerivedMesh *dm, int drawLooseEdges, int
drawAllEdges);
/* Draw all loose edges (edges w/ no adjoining faces) */
void (*drawLooseEdges)(DerivedMesh *dm);
Modified: trunk/blender/source/blender/blenkernel/BKE_paint.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_paint.h 2010-03-22 09:55:58 UTC
(rev 27656)
+++ trunk/blender/source/blender/blenkernel/BKE_paint.h 2010-03-22 11:59:36 UTC
(rev 27657)
@@ -69,13 +69,15 @@
struct MFace *mface;
int totvert, totface;
float *face_normals;
- struct PBVH *tree;
struct Object *ob;
struct KeyBlock *kb, *refkb;
/* Mesh connectivity */
struct ListBase *fmap;
+ /* PBVH acceleration structure */
+ struct PBVH *pbvh;
+
/* Used temporarily per-stroke */
float *vertexcosnos;
@@ -87,7 +89,6 @@
/* Layer brush persistence between strokes */
float (*layer_co)[3]; /* Copy of the mesh vertices' locations */
- float *layer_disps; /* Displacements for each vertex */
struct SculptStroke *stroke;
struct StrokeCache *cache;
@@ -95,6 +96,6 @@
struct GPUDrawObject *drawobject;
} SculptSession;
-void free_sculptsession(SculptSession **);
+void free_sculptsession(struct Object *ob);
#endif
Modified: trunk/blender/source/blender/blenkernel/BKE_subsurf.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_subsurf.h 2010-03-22
09:55:58 UTC (rev 27656)
+++ trunk/blender/source/blender/blenkernel/BKE_subsurf.h 2010-03-22
11:59:36 UTC (rev 27657)
@@ -28,19 +28,21 @@
#ifndef BKE_SUBSURF_H
#define BKE_SUBSURF_H
-struct Mesh;
-struct Object;
+struct DMGridAdjacency;
+struct DMGridData;
struct DerivedMesh;
struct EditMesh;
+struct IndexNode;
+struct ListBase;
+struct Mesh;
struct MultiresSubsurf;
+struct Object;
+struct PBVH;
struct SubsurfModifierData;
+struct _CCGEdge;
+struct _CCGFace;
struct _CCGSubsurf;
struct _CCGVert;
-struct _CCGEdge;
-struct _CCGFace;
-struct PBVH;
-struct DMGridData;
-struct DMGridAdjacency;
/**************************** External *****************************/
@@ -70,6 +72,8 @@
char *faceFlags;
struct PBVH *pbvh;
+ struct ListBase *fmap;
+ struct IndexNode *fmap_mem;
struct DMGridData **gridData;
struct DMGridAdjacency *gridAdjacency;
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2010-03-22 09:55:58 UTC (rev 27656)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
2010-03-22 11:59:36 UTC (rev 27657)
@@ -41,10 +41,11 @@
#include "DNA_object_types.h"
#include "DNA_scene_types.h" // N_T
-#include "BLI_math.h"
#include "BLI_blenlib.h"
#include "BLI_editVert.h"
+#include "BLI_math.h"
#include "BLI_memarena.h"
+#include "BLI_pbvh.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_displist.h"
@@ -509,7 +510,7 @@
glEnd();
}
}
-static void emDM_drawEdges(DerivedMesh *dm, int drawLooseEdges)
+static void emDM_drawEdges(DerivedMesh *dm, int drawLooseEdges, int
drawAllEdges)
{
emDM_drawMappedEdges(dm, NULL, NULL);
}
@@ -2094,6 +2095,15 @@
ob->derivedDeform->release(ob->derivedDeform);
ob->derivedDeform= NULL;
}
+ /* we free pbvh on changes, except during sculpt since it can't deal
with
+ changing PVBH node organization, we hope topology does not change in
+ the meantime .. weak */
+ if(ob->sculpt && ob->sculpt->pbvh) {
+ if(!ob->sculpt->cache) {
+ BLI_pbvh_free(ob->sculpt->pbvh);
+ ob->sculpt->pbvh= NULL;
+ }
+ }
}
static void mesh_build_data(Scene *scene, Object *ob, CustomDataMask dataMask)
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2010-03-22 09:55:58 UTC (rev 27656)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
2010-03-22 11:59:36 UTC (rev 27657)
@@ -39,12 +39,13 @@
#include "BKE_cdderivedmesh.h"
#include "BKE_global.h"
#include "BKE_mesh.h"
+#include "BKE_paint.h"
#include "BKE_utildefines.h"
-#include "BLI_math.h"
#include "BLI_blenlib.h"
#include "BLI_edgehash.h"
#include "BLI_editVert.h"
+#include "BLI_math.h"
#include "BLI_pbvh.h"
#include "DNA_meshdata_types.h"
@@ -188,6 +189,16 @@
{
CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
+ if(!ob) {
+ cddm->pbvh= NULL;
+ return NULL;
+ }
+
+ if(!ob->sculpt)
+ return NULL;
+ if(ob->sculpt->pbvh)
+ cddm->pbvh= ob->sculpt->pbvh;
+
if(!cddm->pbvh && ob->type == OB_MESH) {
Mesh *me= ob->data;
@@ -290,7 +301,7 @@
}
}
-static void cdDM_drawEdges(DerivedMesh *dm, int drawLooseEdges)
+static void cdDM_drawEdges(DerivedMesh *dm, int drawLooseEdges, int
drawAllEdges)
{
CDDerivedMesh *cddm = (CDDerivedMesh*) dm;
MVert *mvert = cddm->mvert;
@@ -301,7 +312,7 @@
DEBUG_VBO( "Using legacy code. cdDM_drawEdges\n" );
glBegin(GL_LINES);
for(i = 0; i < dm->numEdgeData; i++, medge++) {
- if((medge->flag&ME_EDGEDRAW)
+ if((drawAllEdges || (medge->flag&ME_EDGEDRAW))
&& (drawLooseEdges || !(medge->flag&ME_LOOSEEDGE))) {
glVertex3fv(mvert[medge->v1].co);
glVertex3fv(mvert[medge->v2].co);
@@ -317,7 +328,7 @@
GPU_edge_setup(dm);
if( !GPU_buffer_legacy(dm) ) {
for(i = 0; i < dm->numEdgeData; i++, medge++) {
- if((medge->flag&ME_EDGEDRAW)
+ if((drawAllEdges || (medge->flag&ME_EDGEDRAW))
&& (drawLooseEdges ||
!(medge->flag&ME_LOOSEEDGE))) {
draw = 1;
}
@@ -1354,7 +1365,6 @@
static void cdDM_free_internal(CDDerivedMesh *cddm)
{
- if(cddm->pbvh) BLI_pbvh_free(cddm->pbvh);
if(cddm->fmap) MEM_freeN(cddm->fmap);
if(cddm->fmap_mem) MEM_freeN(cddm->fmap_mem);
}
Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c 2010-03-22
09:55:58 UTC (rev 27656)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c 2010-03-22
11:59:36 UTC (rev 27657)
@@ -68,6 +68,7 @@
#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "BKE_object.h"
+#include "BKE_paint.h"
#include "BKE_particle.h"
#include "BKE_pointcache.h"
#include "BKE_scene.h"
@@ -9064,10 +9065,10 @@
result->release(result);
result= cddm;
}
- else if(ob->mode & OB_MODE_SCULPT) {
+ else if((ob->mode & OB_MODE_SCULPT) && ob->sculpt) {
/* would be created on the fly too, just nicer this
way on first stroke after e.g. switching levels */
- result->getPBVH(ob, result);
+ ob->sculpt->pbvh= result->getPBVH(ob, result);
}
return result;
Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c 2010-03-22
09:55:58 UTC (rev 27656)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c 2010-03-22
11:59:36 UTC (rev 27657)
@@ -34,14 +34,15 @@
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
+#include "BLI_blenlib.h"
#include "BLI_math.h"
-#include "BLI_blenlib.h"
#include "BLI_pbvh.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "BKE_multires.h"
+#include "BKE_paint.h"
#include "BKE_scene.h"
#include "BKE_subsurf.h"
#include "BKE_utildefines.h"
@@ -109,11 +110,16 @@
void multires_force_update(Object *ob)
{
-
- if(ob && ob->derivedFinal) {
- ob->derivedFinal->needsFree =1;
- ob->derivedFinal->release(ob->derivedFinal);
- ob->derivedFinal = NULL;
+ if(ob) {
+ if(ob->derivedFinal) {
+ ob->derivedFinal->needsFree =1;
+ ob->derivedFinal->release(ob->derivedFinal);
+ ob->derivedFinal = NULL;
+ }
+ if(ob->sculpt && ob->sculpt->pbvh) {
+ BLI_pbvh_free(ob->sculpt->pbvh);
+ ob->sculpt->pbvh= NULL;
+ }
}
}
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2010-03-22
09:55:58 UTC (rev 27656)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2010-03-22
11:59:36 UTC (rev 27657)
@@ -58,8 +58,9 @@
#include "DNA_world_types.h"
#include "BLI_blenlib.h"
+#include "BLI_editVert.h"
#include "BLI_math.h"
-#include "BLI_editVert.h"
+#include "BLI_pbvh.h"
#include "BKE_utildefines.h"
@@ -231,23 +232,26 @@
freedisplist(&ob->disp);
}
-void free_sculptsession(SculptSession **ssp)
+void free_sculptsession(Object *ob)
{
- if(ssp && *ssp) {
- SculptSession *ss = *ssp;
+ if(ob && ob->sculpt) {
+ SculptSession *ss = ob->sculpt;
+ DerivedMesh *dm= ob->derivedFinal;
+ if(ss->pbvh)
+ BLI_pbvh_free(ss->pbvh);
+ if(dm && dm->getPBVH)
+ dm->getPBVH(NULL, dm); /* signal to clear */
+
if(ss->texcache)
MEM_freeN(ss->texcache);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
