Revision: 29136
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29136
Author: jwilkins
Date: 2010-06-01 19:52:31 +0200 (Tue, 01 Jun 2010)
Log Message:
-----------
Fixed some syntax errors in MSVC caused by using C99/C++ style 'declarations
anywhere'.
Modified Paths:
--------------
branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
Modified: branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
2010-06-01 17:43:46 UTC (rev 29135)
+++ branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
2010-06-01 17:52:31 UTC (rev 29136)
@@ -10908,10 +10908,12 @@
}
}
}
- Brush *brush;
- for (brush= main->brush.first; brush; brush= brush->id.next)
- if(brush->detail == 0.0f)
- brush->detail = 0.25f;
+ {
+ Brush *brush;
+ for (brush= main->brush.first; brush; brush= brush->id.next)
+ if(brush->detail == 0.0f)
+ brush->detail = 0.25f;
+ }
/* WATCH IT!!!: pointers from libdata have not been converted yet here!
*/
/* WATCH IT 2!: Userdef struct init has to be in
editors/interface/resources.c! */
Modified:
branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
2010-06-01 17:43:46 UTC (rev 29135)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
2010-06-01 17:52:31 UTC (rev 29136)
@@ -588,12 +588,13 @@
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);
- EditMesh *em = me->edit_mesh;
+ em = me->edit_mesh;
ss->scene->toolsettings->selectmode = tempselectmode; /* restore scene
select mode*/
@@ -612,22 +613,27 @@
static void unlimited_clay(SculptSession *ss, Object *ob)
{
/*---- adaptive dynamic subdivission -- */
- float v1co[3],v2co[3],diff[3], edgeLength;
+ float diff[3], edgeLength;
if (ss->scene != NULL && ob != NULL)
{
+ Object *obedit;
+ Mesh *me;
+ EditEdge *eed;
+
create_EditMesh_sculpt(ss);
- Object *obedit= ob;
- Mesh *me= obedit->data;
- EditEdge *eed;
+ obedit= ob;
+ me= obedit->data;
for(eed = me->edit_mesh->edges.first; eed; eed =
eed->next){
if (eed->f & SELECT)
{
+ float detail;
+
sub_v3_v3v3(diff, eed->v1->co,
eed->v2->co);
edgeLength = len_v3(diff);
- float detail = ss->cache->detail *
ss->cache->radius;
+ detail = ss->cache->detail *
ss->cache->radius;
if (edgeLength < detail)
EM_select_edge(eed, 0);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
