diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 09:52:46 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 09:52:46 +0400 |
commit | 67386c003d5d4bd5355323acdfbef1aa9fa2b71d (patch) | |
tree | 85c176899dcd43ec811093da8914fa1976c340b3 /source/blender | |
parent | f9f4ad6a849605b364d987198c5aefba5480cb51 (diff) | |
parent | 1e035381d10068eb17345a88d42cebc0d579adf3 (diff) |
svn merge -r41715:41722 ^/trunk/blender
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 11 | ||||
-rw-r--r-- | source/blender/nodes/CMakeLists.txt | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 4d024113cf8..04239ab9508 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -431,8 +431,9 @@ void vpaint_fill(Object *ob, unsigned int paintcol) me= get_mesh(ob); if(me==NULL || me->totface==0) return; - if(!me->mcol) - make_vertexcol(ob); + if(!me->mcol) make_vertexcol(ob); + if(!me->mcol) return; /* possible we can't make mcol's */ + selected= (me->editflag & ME_EDIT_PAINT_MASK); @@ -1758,8 +1759,14 @@ static void do_weight_paint_vertex( /* vars which remain the same for every vert if(dv_copy.dw) { MEM_freeN(dv_copy.dw); } +#if 0 /* dv may have been altered greatly */ dw = defvert_find_index(dv, vgroup); +#else + dw = NULL; /* UNUSED after assignment, set to NULL to ensuyre we don't + * use again, we thats needed un-ifdef the line above */ + (void)dw; /* quiet warnigns */ +#endif if(me->editflag & ME_EDIT_MIRROR_X) { /* x mirror painting */ int index_mirr= mesh_get_x_mirror_vert(ob, index); diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 368ab1db50c..1b327edbc9f 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -131,6 +131,7 @@ set(SRC shader/nodes/node_shader_vectMath.c shader/nodes/node_shader_attribute.c shader/nodes/node_shader_background.c + # shader/nodes/node_shader_bsdf_anisotropic.c # XXX, why not included? shader/nodes/node_shader_bsdf_diffuse.c shader/nodes/node_shader_bsdf_glossy.c shader/nodes/node_shader_bsdf_glass.c |