Revision: 30064
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30064
Author: jwilkins
Date: 2010-07-07 02:26:31 +0200 (Wed, 07 Jul 2010)
Log Message:
-----------
* removed unlimited clay
Modified Paths:
--------------
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_paint.h
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_brush_types.h
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c
Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
2010-07-06 23:39:10 UTC (rev 30063)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
2010-07-07 00:26:31 UTC (rev 30064)
@@ -1012,12 +1012,6 @@
#col.separator();
- #col.prop(brush,"use_dynamic_subdiv")
- #col.active = brush.use_dynamic_subdiv
- #col.prop(brush,"detail",slider=True)
- #col.active = brush.use_dynamic_subdiv
- #col.prop(brush,"smoothness",slider=True)
-
if brush.sculpt_tool in ('DRAW', 'INFLATE', 'CLAY', 'WAX', 'PINCH',
'CREASE', 'BLOB', 'FLATTEN'):
sub = col.column()
sub.label(text="Color:")
Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_paint.h
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_paint.h
2010-07-06 23:39:10 UTC (rev 30063)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_paint.h
2010-07-07 00:26:31 UTC (rev 30064)
@@ -71,9 +71,6 @@
float *face_normals;
struct Object *ob;
struct KeyBlock *kb;
-
- struct Scene *scene; //Mio
- struct EditMesh *em; //Mio
/* Mesh connectivity */
struct ListBase *fmap;
Modified:
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
2010-07-06 23:39:10 UTC (rev 30063)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
2010-07-07 00:26:31 UTC (rev 30064)
@@ -178,8 +178,6 @@
int flag;
float clip_tolerance[3];
float initial_mouse[2];
- float detail;
- float smoothness;
/* Variants */
float radius;
@@ -454,33 +452,7 @@
*
*/
-static void create_EditMesh_sculpt(SculptSession *ss) //Mio
-{
- EditEdge *eed;
- Object *obedit= ss->ob;
- Mesh *me= obedit->data;
- EditMesh *em;
- int tempselectmode = ss->scene->toolsettings->selectmode; /* store
temporal scene select mode*/
- ss->scene->toolsettings->selectmode = SCE_SELECT_VERTEX;
-
- make_editMesh(ss->scene, obedit);
- em = me->edit_mesh;
-
- ss->scene->toolsettings->selectmode = tempselectmode; /* restore scene
select mode*/
-
- /*select all edges associated with every selected vertex*/
- for(eed= em->edges.first; eed; eed= eed->next){
- if(eed->v1->f&SELECT) eed->f1 = 1;
- else if(eed->v2->f&SELECT) eed->f1 = 1;
- }
-
- for(eed= em->edges.first; eed; eed= eed->next)
- if(eed->f1 == 1) EM_select_edge(eed,1);
-
- ss->em = em;
-}
-
/* area of overlap of two circles of radius 1 seperated by d units from their
centers */
static float circle_overlap(float d)
{
@@ -1046,13 +1018,8 @@
sculpt_clip(sd, ss, vd.co, val);
- if(vd.mvert) {
+ if(vd.mvert)
vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
-
- // unlimited clay
- //if(brush->flag & BRUSH_SUBDIV)
- // vd.mvert->flag = 1;
- }
}
}
BLI_pbvh_vertex_iter_end;
@@ -1231,13 +1198,8 @@
mul_v3_v3fl(proxy[vd.i], offset, fade);
- if(vd.mvert) {
+ if(vd.mvert)
vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
-
- // XXX unlimited clay
- //if(brush->flag & BRUSH_SUBDIV)
- // vd.mvert->flag = 1;
- }
}
}
BLI_pbvh_vertex_iter_end;
@@ -1299,13 +1261,8 @@
add_v3_v3v3(proxy[vd.i], val1, val2);
- if(vd.mvert) {
+ if(vd.mvert)
vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
-
- // unlimited clay
- //if(brush->flag & BRUSH_SUBDIV)
- // vd.mvert->flag = 1;
- }
}
}
BLI_pbvh_vertex_iter_end;
@@ -1337,14 +1294,9 @@
//mul_v3_v3(val, ss->cache->scale);
mul_v3_v3fl(proxy[vd.i], val, fade);
- if(vd.mvert) {
+ if(vd.mvert)
vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
-
- // unlimited clay
- //if(brush->flag & BRUSH_SUBDIV)
- // vd.mvert->flag = 1;
}
- }
}
BLI_pbvh_vertex_iter_end;
}
@@ -1389,13 +1341,8 @@
mul_v3_v3fl(proxy[vd.i], grab_delta, fade);
- if(vd.mvert) {
+ if(vd.mvert)
vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
-
- // XXX unlimited clay
- //if(brush->flag & BRUSH_SUBDIV)
- // vd.mvert->flag = 1;
- }
}
}
BLI_pbvh_vertex_iter_end;
@@ -1434,13 +1381,8 @@
mul_v3_v3fl(proxy[vd.i], cono, fade);
- if(vd.mvert) {
+ if(vd.mvert)
vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
-
- // unlimited clay
- //if(brush->flag & BRUSH_SUBDIV)
- // vd.mvert->flag = 1;
- }
}
}
BLI_pbvh_vertex_iter_end;
@@ -1487,13 +1429,8 @@
mul_v3_v3fl(proxy[vd.i], grab_delta, fade);
- if(vd.mvert) {
+ if(vd.mvert)
vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
-
- // unlimited clay
- //if(brush->flag & BRUSH_SUBDIV)
- // vd.mvert->flag = 1;
- }
}
}
BLI_pbvh_vertex_iter_end;
@@ -1535,12 +1472,8 @@
mul_v3_v3fl(proxy[vd.i], cono, fade);
- if(vd.mvert) {
+ if(vd.mvert)
vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
-
- if(brush->flag & BRUSH_SUBDIV)
- vd.mvert->flag = 1;
- }
}
}
BLI_pbvh_vertex_iter_end;
@@ -1582,10 +1515,8 @@
sub_v3_v3(proxy[vd.i], origco[vd.i]);
mul_v3_fl(proxy[vd.i], fade);
- if(vd.mvert) {
+ if(vd.mvert)
vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
- if(brush->flag & BRUSH_SUBDIV)
vd.mvert->flag = 1;
- }
}
}
BLI_pbvh_vertex_iter_end;
@@ -1654,10 +1585,9 @@
}
sculpt_clip(sd, ss, vd.co, val);
- if(vd.mvert) {
+
+ if(vd.mvert)
vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
- if(brush->flag & BRUSH_SUBDIV)
vd.mvert->flag = 1;
- }
}
}
BLI_pbvh_vertex_iter_end;
@@ -1691,13 +1621,8 @@
mul_v3_fl(val, fade * ss->cache->radius);
mul_v3_v3v3(proxy[vd.i], val, ss->cache->scale);
- if(vd.mvert) {
+ if(vd.mvert)
vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
-
- // unlimited clay
- //if(brush->flag & BRUSH_SUBDIV)
- // vd.mvert->flag = 1;
- }
}
}
BLI_pbvh_vertex_iter_end;
@@ -1997,13 +1922,8 @@
sub_v3_v3v3(val, intr, vd.co);
mul_v3_v3fl(proxy[vd.i], val, fade);
- if(vd.mvert) {
+ if(vd.mvert)
vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
-
- // unlimited clay
- //if(brush->flag & BRUSH_SUBDIV)
- // vd.mvert->flag = 1;
- }
}
}
BLI_pbvh_vertex_iter_end;
@@ -2068,13 +1988,8 @@
sub_v3_v3v3(proxy[vd.i], intr, vd.co);
mul_v3_fl(proxy[vd.i], fade);
- if(vd.mvert) {
+ if(vd.mvert)
vd.mvert->flag |= ME_VERT_PBVH_UPDATE;
-
- // unlimited clay
- //if(brush->flag & BRUSH_SUBDIV)
- // vd.mvert->flag = 1;
- }
}
}
BLI_pbvh_vertex_iter_end;
@@ -2137,13 +2052,8 @@
sub_v3_v3v3(val, intr, vd.co);
mul_v3_v3fl(proxy[vd.i], val, fade);
- if(vd.mvert) {
+ if(vd.mvert)
vd.mvert->flag |=
ME_VERT_PBVH_UPDATE;
-
- // unlimited clay
- //if (brush->flag &
BRUSH_SUBDIV)
- // vd.mvert->flag = 1;
- }
}
}
}
@@ -2198,13 +2108,8 @@
sub_v3_v3v3(val, intr, vd.co);
mul_v3_v3fl(proxy[vd.i], val, fade);
- if(vd.mvert) {
+ if(vd.mvert)
vd.mvert->flag |=
ME_VERT_PBVH_UPDATE;
-
- // unlimited clay
- //if(brush->flag & BRUSH_SUBDIV)
- // vd.mvert->flag = 1;
- }
}
}
}
@@ -2259,13 +2164,8 @@
sub_v3_v3v3(val, intr, vd.co);
mul_v3_v3fl(proxy[vd.i], val, fade);
- if(vd.mvert) {
+ if(vd.mvert)
vd.mvert->flag |=
ME_VERT_PBVH_UPDATE;
-
- // unlimited clay
- //if(brush->flag & BRUSH_SUBDIV)
- // vd.mvert->flag = 1;
- }
}
}
}
@@ -2828,11 +2728,6 @@
cache->brush = brush;
- if (brush->flag & BRUSH_SUBDIV){
- cache->detail = brush->detail;
- cache->smoothness = brush->smoothness;
- }
-
cache->mats = MEM_callocN(sizeof(bglMats), "sculpt bglMats");
view3d_get_transformation(vc->ar, vc->rv3d, vc->obact, cache->mats);
@@ -3548,7 +3443,6 @@
{
ob->sculpt = MEM_callocN(sizeof(SculptSession), "sculpt session");
ob->sculpt->ob = ob;
- ob->sculpt->scene = scene;
sculpt_update_mesh_elements(scene, ob, 0);
}
Modified: branches/soc-2010-jwilkins/source/blender/makesdna/DNA_brush_types.h
===================================================================
--- branches/soc-2010-jwilkins/source/blender/makesdna/DNA_brush_types.h
2010-07-06 23:39:10 UTC (rev 30063)
+++ branches/soc-2010-jwilkins/source/blender/makesdna/DNA_brush_types.h
2010-07-07 00:26:31 UTC (rev 30064)
@@ -130,7 +130,6 @@
#define BRUSH_LOCK_ALPHA (1<<14)
#define BRUSH_ORIGINAL_NORMAL (1<<15)
#define BRUSH_OFFSET_PRESSURE (1<<16)
-#define BRUSH_SUBDIV (1<<17)
#define BRUSH_SPACE_ATTEN (1<<18)
#define BRUSH_ADAPTIVE_SPACE (1<<19)
#define BRUSH_LOCK_SIZE (1<<20)
Modified: branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c
2010-07-06 23:39:10 UTC (rev 30063)
+++ branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_brush.c
2010-07-07 00:26:31 UTC (rev 30064)
@@ -289,16 +289,6 @@
RNA_def_property_ui_text(prop, "Surface Size", "Radius of brush in
Blender units");
RNA_def_property_update(prop, 0, "rna_Brush_update");
- prop= RNA_def_property(srna, "detail", PROP_FLOAT, PROP_NONE);
- RNA_def_property_range(prop, 0.05f, 1.0f);
- RNA_def_property_ui_text(prop, "Detail", "Dynamic subdivission detail");
- RNA_def_property_update(prop, 0, "rna_Brush_update");
-
- prop= RNA_def_property(srna, "smoothness", PROP_FLOAT, PROP_NONE);
- RNA_def_property_range(prop, 0.0f, 1.0f);
- RNA_def_property_ui_text(prop, "Smoothness", "Dynamic subdivission
smoothness");
- RNA_def_property_update(prop, 0, "rna_Brush_update");
-
prop= RNA_def_property(srna, "jitter", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "jitter");
RNA_def_property_range(prop, 0.0f, 1.0f);
@@ -469,11 +459,6 @@
RNA_def_property_ui_text(prop, "Accumulate", "Accumulate stroke dabs on
top of each other");
RNA_def_property_update(prop, 0, "rna_Brush_update");
- prop= RNA_def_property(srna, "use_dynamic_subdiv", PROP_BOOLEAN,
PROP_NONE); //Mio
- RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_SUBDIV);
- RNA_def_property_ui_text(prop, "Unlimited clay", "Dynamic subdivission
on the fly while sculpting");
- RNA_def_property_update(prop, 0, "rna_Brush_update");
-
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
