Revision: 27820
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27820
Author:   broken
Date:     2010-03-29 07:00:04 +0200 (Mon, 29 Mar 2010)

Log Message:
-----------
Fix [#21679] add_grid "operator's subdivison" Change Dimensions 

Modified Paths:
--------------
    trunk/blender/source/blender/editors/mesh/editmesh_add.c
    trunk/blender/source/blender/editors/mesh/editmesh_mods.c

Modified: trunk/blender/source/blender/editors/mesh/editmesh_add.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_add.c    2010-03-28 
23:30:00 UTC (rev 27819)
+++ trunk/blender/source/blender/editors/mesh/editmesh_add.c    2010-03-29 
05:00:04 UTC (rev 27820)
@@ -996,25 +996,23 @@
                        eve->f= 0;
                        eve= eve->next;
                }
-               /* one segment first: the X axis */
-               phi= 1.0; 
-               phid= 2.0/((float)tot-1);
+               
+               /* one segment first: the X axis */             
+               phi = (2*dia)/(float)(tot-1);
+               phid = (2*dia)/(float)(seg-1);
                for(a=0;a<tot;a++) {
-                       vec[0]= dia*phi;
+                       vec[0] = (phi*a) - dia;
                        vec[1]= - dia;
                        vec[2]= 0.0f;
-                       mul_m4_v3(mat,vec);
                        eve= addvertlist(em, vec, NULL);
                        eve->f= 1+2+4;
                        if (a) {
                                addedgelist(em, eve->prev, eve, NULL);
                        }
-                       phi-=phid;
                }
                /* extrude and translate */
                vec[0]= vec[2]= 0.0;
-               vec[1]= dia*phid;
-               mul_mat3_m4_v3(mat, vec);
+               vec[1]= phid;
                
                for(a=0;a<seg-1;a++) {
                        extrudeflag_vert(obedit, em, 2, nor, 0);        // nor 
unused

Modified: trunk/blender/source/blender/editors/mesh/editmesh_mods.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_mods.c   2010-03-28 
23:30:00 UTC (rev 27819)
+++ trunk/blender/source/blender/editors/mesh/editmesh_mods.c   2010-03-29 
05:00:04 UTC (rev 27820)
@@ -4541,7 +4541,7 @@
        /* flags */
        ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
-       prop= RNA_def_float(ot->srna, "thickness", 0.01f, -FLT_MAX, FLT_MAX, 
"thickness", "", -10.0f, 10.0f);
+       prop= RNA_def_float(ot->srna, "thickness", 0.01f, -FLT_MAX, FLT_MAX, 
"Thickness", "", -10.0f, 10.0f);
        RNA_def_property_ui_range(prop, -10, 10, 0.1, 4);
 }
 


_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to