[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40336] branches/soc-2011-radish: edits to radish before merge with trunk
Campbell Barton
ideasman42 at gmail.com
Mon Sep 19 04:43:04 CEST 2011
Revision: 40336
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40336
Author: campbellbarton
Date: 2011-09-19 02:43:03 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
edits to radish before merge with trunk
- removed some unused functions.
- renamed vars to make more sense paint_vertex.c 'flags' --> 'lock_flags'
- some odd modifications were made in unrealted, commented code, copy these back from trunk.
- rename vertex_group_fix 'cp' property to 'accuracy'
- make style more consistant with trunk.
- remove 'Radish' comments.
Modified Paths:
--------------
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-radish/source/blender/blenkernel/BKE_paint.h
branches/soc-2011-radish/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-radish/source/blender/blenkernel/intern/particle.c
branches/soc-2011-radish/source/blender/editors/armature/meshlaplacian.c
branches/soc-2011-radish/source/blender/editors/include/ED_view3d.h
branches/soc-2011-radish/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-radish/source/blender/editors/interface/interface_templates.c
branches/soc-2011-radish/source/blender/editors/mesh/editmesh.c
branches/soc-2011-radish/source/blender/editors/object/object_intern.h
branches/soc-2011-radish/source/blender/editors/object/object_ops.c
branches/soc-2011-radish/source/blender/editors/object/object_vgroup.c
branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-radish/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-radish/source/blender/imbuf/intern/md5.c
branches/soc-2011-radish/source/blender/makesdna/DNA_scene_types.h
Modified: branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d.py 2011-09-18 22:59:51 UTC (rev 40335)
+++ branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d.py 2011-09-19 02:43:03 UTC (rev 40336)
@@ -1072,7 +1072,6 @@
layout.operator("object.vertex_group_invert", text="Invert")
layout.operator("object.vertex_group_clean", text="Clean")
layout.operator("object.vertex_group_levels", text="Levels")
- # Radish
layout.operator("object.vertex_group_fix", text="Fix Deforms")
layout.separator()
Modified: branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-09-18 22:59:51 UTC (rev 40335)
+++ branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-09-19 02:43:03 UTC (rev 40336)
@@ -646,7 +646,6 @@
elif context.weight_paint_object and brush:
layout.prop(context.tool_settings, "vertex_group_weight", text="Weight", slider=True)
layout.prop(context.tool_settings, "use_auto_normalize", text="Auto Normalize")
- # Radish
layout.prop(context.tool_settings, "use_multipaint", text="Multi-Paint")
col = layout.column()
Modified: branches/soc-2011-radish/source/blender/blenkernel/BKE_paint.h
===================================================================
--- branches/soc-2011-radish/source/blender/blenkernel/BKE_paint.h 2011-09-18 22:59:51 UTC (rev 40335)
+++ branches/soc-2011-radish/source/blender/blenkernel/BKE_paint.h 2011-09-19 02:43:03 UTC (rev 40336)
@@ -59,8 +59,8 @@
* Texture paint could be removed since selected faces are not used
* however hiding faces is useful */
int paint_facesel_test(struct Object *ob);
+int paint_vertsel_test(struct Object *ob);
-int paint_vertsel_test(struct Object *ob);
/* Session data (mode-specific) */
typedef struct SculptSession {
Modified: branches/soc-2011-radish/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2011-radish/source/blender/blenkernel/intern/DerivedMesh.c 2011-09-18 22:59:51 UTC (rev 40335)
+++ branches/soc-2011-radish/source/blender/blenkernel/intern/DerivedMesh.c 2011-09-19 02:43:03 UTC (rev 40336)
@@ -40,9 +40,7 @@
#include "DNA_cloth_types.h"
#include "DNA_key_types.h"
#include "DNA_meshdata_types.h"
-
#include "DNA_armature_types.h"
-
#include "DNA_object_types.h"
#include "DNA_scene_types.h" // N_T
@@ -1760,7 +1758,6 @@
ColorBand *coba= stored_cb; /* warning, not a local var */
unsigned char *wtcol;
int i;
-
int defbase_len = BLI_countlist(&ob->defbase);
char *defbase_sel = MEM_mallocN(defbase_len * sizeof(char), __func__);
@@ -1807,7 +1804,6 @@
int has_multires = mmd != NULL, multires_applied = 0;
int sculpt_mode = ob->mode & OB_MODE_SCULPT && ob->sculpt;
-
int draw_flag= ((scene->toolsettings->multipaint ? CALC_WP_MULTIPAINT : 0) |
(scene->toolsettings->auto_normalize ? CALC_WP_AUTO_NORMALIZE : 0));
Modified: branches/soc-2011-radish/source/blender/blenkernel/intern/particle.c
===================================================================
--- branches/soc-2011-radish/source/blender/blenkernel/intern/particle.c 2011-09-18 22:59:51 UTC (rev 40335)
+++ branches/soc-2011-radish/source/blender/blenkernel/intern/particle.c 2011-09-19 02:43:03 UTC (rev 40336)
@@ -2870,7 +2870,7 @@
PARTICLE_P;
float birthtime = 0.0, dietime = 0.0;
- float t, time = 0.0, dfra = 1.0 /* frs_sec = sim->scene->r.frs_sec*/ /*UNUSED*/;
+ float t, time = 0.0, dfra = 1.0 /* , frs_sec = sim->scene->r.frs_sec*/ /*UNUSED*/;
float col[4] = {0.5f, 0.5f, 0.5f, 1.0f};
float prev_tangent[3] = {0.0f, 0.0f, 0.0f}, hairmat[4][4];
float rotmat[3][3];
Modified: branches/soc-2011-radish/source/blender/editors/armature/meshlaplacian.c
===================================================================
--- branches/soc-2011-radish/source/blender/editors/armature/meshlaplacian.c 2011-09-18 22:59:51 UTC (rev 40335)
+++ branches/soc-2011-radish/source/blender/editors/armature/meshlaplacian.c 2011-09-19 02:43:03 UTC (rev 40336)
@@ -657,27 +657,42 @@
int *vertsflipped = NULL, *mask= NULL;
int a, totface, j, bbone, firstsegment, lastsegment;
-
- MVert *mv = me->mvert;
+ MVert *mvert = me->mvert;
int use_vert_sel= FALSE;
+ int use_face_sel= FALSE;
*err_str= NULL;
/* count triangles and create mask */
- if((me->editflag & ME_EDIT_PAINT_MASK) || (use_vert_sel= ((me->editflag & ME_EDIT_VERT_SEL) != 0)))
+ if( (use_face_sel= (me->editflag & ME_EDIT_PAINT_MASK) != 0) ||
+ (use_vert_sel= ((me->editflag & ME_EDIT_VERT_SEL) != 0)))
+ {
mask= MEM_callocN(sizeof(int)*me->totvert, "heat_bone_weighting mask");
+ }
for(totface=0, a=0, mface=me->mface; a<me->totface; a++, mface++) {
totface++;
if(mface->v4) totface++;
+
/* (added selectedVerts content for vertex mask, they used to just equal 1) */
- if(mask && ((mface->flag & ME_FACE_SEL) || use_vert_sel)) {
- mask[mface->v1]= use_vert_sel ? ((mv+mface->v1)->flag & 1): 1;
- mask[mface->v2]= use_vert_sel ? ((mv+mface->v2)->flag & 1): 1;
- mask[mface->v3]= use_vert_sel ? ((mv+mface->v3)->flag & 1): 1;
- if(mface->v4)
- mask[mface->v4]= use_vert_sel ? ((mv+mface->v4)->flag & 1): 1;
+ if(use_vert_sel) {
+ mask[mface->v1]= (mvert[mface->v1].flag & SELECT) != 0;
+ mask[mface->v2]= (mvert[mface->v2].flag & SELECT) != 0;
+ mask[mface->v3]= (mvert[mface->v3].flag & SELECT) != 0;
+ if(mface->v4) {
+ mask[mface->v4]= (mvert[mface->v4].flag & SELECT) != 0;
+ }
}
+ else {
+ if(use_face_sel) {
+ mask[mface->v1]= 1;
+ mask[mface->v2]= 1;
+ mask[mface->v3]= 1;
+ if(mface->v4) {
+ mask[mface->v4]= 1;
+ }
+ }
+ }
}
/* create laplacian */
Modified: branches/soc-2011-radish/source/blender/editors/include/ED_view3d.h
===================================================================
--- branches/soc-2011-radish/source/blender/editors/include/ED_view3d.h 2011-09-18 22:59:51 UTC (rev 40335)
+++ branches/soc-2011-radish/source/blender/editors/include/ED_view3d.h 2011-09-19 02:43:03 UTC (rev 40336)
@@ -216,9 +216,6 @@
void ED_view3d_calc_camera_border(struct Scene *scene, struct ARegion *ar, struct View3D *v3d, struct RegionView3D *rv3d, struct rctf *viewborder_r, short do_shift);
/* drawobject.c iterators */
-
-void mesh_obmode_foreachScreenVert(struct ViewContext *vc, void (*func)(void *userData, struct MVert *mv, int x, int y, int index), void *userData, int clipVerts);
-
void mesh_foreachScreenVert(struct ViewContext *vc, void (*func)(void *userData, struct EditVert *eve, int x, int y, int index), void *userData, int clipVerts);
void mesh_foreachScreenEdge(struct ViewContext *vc, void (*func)(void *userData, struct EditEdge *eed, int x0, int y0, int x1, int y1, int index), void *userData, int clipVerts);
void mesh_foreachScreenFace(struct ViewContext *vc, void (*func)(void *userData, struct EditFace *efa, int x, int y, int index), void *userData);
Modified: branches/soc-2011-radish/source/blender/editors/interface/interface_handlers.c
===================================================================
--- branches/soc-2011-radish/source/blender/editors/interface/interface_handlers.c 2011-09-18 22:59:51 UTC (rev 40335)
+++ branches/soc-2011-radish/source/blender/editors/interface/interface_handlers.c 2011-09-19 02:43:03 UTC (rev 40336)
@@ -3778,7 +3778,7 @@
Scopes *scopes = (Scopes *)but->poin;
/* rcti rect; */
int changed= 1;
- float /* dx, */ dy /* yfac=1.f */; /* UNUSED */
+ float /* dx, */ dy /* , yfac=1.f */; /* UNUSED */
/* rect.xmin= but->x1; rect.xmax= but->x2; */
/* rect.ymin= but->y1; rect.ymax= but->y2; */
Modified: branches/soc-2011-radish/source/blender/editors/interface/interface_templates.c
===================================================================
--- branches/soc-2011-radish/source/blender/editors/interface/interface_templates.c 2011-09-18 22:59:51 UTC (rev 40335)
+++ branches/soc-2011-radish/source/blender/editors/interface/interface_templates.c 2011-09-19 02:43:03 UTC (rev 40336)
@@ -2124,7 +2124,6 @@
//uiItemR(row, itemptr, "mute", 0, "", ICON_MUTE_IPO_OFF);
uiBlockSetEmboss(block, UI_EMBOSS);
}
- /* I need the RNA struct for vertex groups */
else if(itemptr->type == &RNA_VertexGroup) {
bDeformGroup *dg= (bDeformGroup *)itemptr->data;
uiItemL(sub, name, icon);
Modified: branches/soc-2011-radish/source/blender/editors/mesh/editmesh.c
===================================================================
--- branches/soc-2011-radish/source/blender/editors/mesh/editmesh.c 2011-09-18 22:59:51 UTC (rev 40335)
+++ branches/soc-2011-radish/source/blender/editors/mesh/editmesh.c 2011-09-19 02:43:03 UTC (rev 40336)
@@ -1967,30 +1967,35 @@
{
Mesh *me= get_mesh(ob);
DerivedMesh *dm= ob->derivedFinal;
- MVert *verts, *mv, *mv_orig;
+ MVert *dm_mvert, *dm_mv;
int *index_array = NULL;
int totvert;
int i;
-
+
if(me==NULL || dm==NULL)
return;
index_array = dm->getVertDataArray(dm, CD_ORIGINDEX);
-
- verts = dm->getVertArray(dm);
+
+ dm_mvert = dm->getVertArray(dm);
totvert = dm->getNumVerts(dm);
-
- mv= verts;
-
- for (i= 0; i<totvert; i++, mv++) { /* loop over derived mesh faces */
- if(index_array) {
- mv_orig= me->mvert + index_array[i];
- mv->flag= mv_orig->flag;
- } else {
- mv_orig= me->mvert + i;
- mv->flag= mv_orig->flag;
+
+ dm_mv= dm_mvert;
+
+ if(index_array) {
+ int orig_index;
+ for (i= 0; i<totvert; i++, dm_mv++) {
+ orig_index= index_array[i];
+ if(orig_index != ORIGINDEX_NONE) {
+ dm_mv->flag= me->mvert[index_array[i]].flag;
+ }
}
}
+ else {
+ for (i= 0; i<totvert; i++, dm_mv++) {
+ dm_mv->flag= me->mvert[i].flag;
+ }
+ }
}
/* note: if the caller passes FALSE to flush_flags, then they will need to run paintvert_flush_flags(ob) themselves */
void paintvert_deselect_all_visible(Object *ob, int action, short flush_flags)
Modified: branches/soc-2011-radish/source/blender/editors/object/object_intern.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list