[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49025] branches/soc-2011-tomato: Merging r49020 through r49024 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Wed Jul 18 13:49:18 CEST 2012
Revision: 49025
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49025
Author: nazgul
Date: 2012-07-18 11:49:18 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
Merging r49020 through r49024 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49020
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49024
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_matrix.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49019
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49024
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c 2012-07-18 11:48:13 UTC (rev 49024)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c 2012-07-18 11:49:18 UTC (rev 49025)
@@ -2110,7 +2110,7 @@
/* No tessellation on this mesh yet, need to calculate one.
*
* Important not to update face normals from polys since it
- * interfears with assigning the new normal layer in the following code.
+ * interferes with assigning the new normal layer in the following code.
*/
CDDM_recalc_tessellation_ex(dm, FALSE);
}
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c 2012-07-18 11:48:13 UTC (rev 49024)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c 2012-07-18 11:49:18 UTC (rev 49025)
@@ -527,7 +527,7 @@
*diagonal_bucket_b_r = &buckets[diagonal_bucket_b_index];
}
-static void spline_feather_collapse_inner_loops(float (*feather_points)[2], int tot_feather_point)
+static void spline_feather_collapse_inner_loops(MaskSpline *spline, float (*feather_points)[2], int tot_feather_point)
{
#define BUCKET_INDEX(co) \
feather_bucket_index_from_coord(co, min, bucket_scale, buckets_per_side)
@@ -556,8 +556,12 @@
int next = i + 1;
float delta;
- if (next == tot_feather_point)
- next = 0;
+ if (next == tot_feather_point) {
+ if (spline->flag & MASK_SPLINE_CYCLIC)
+ next = 0;
+ else
+ break;
+ }
delta = fabsf(feather_points[i][0] - feather_points[next][0]);
if (delta > max_delta_x)
@@ -600,8 +604,12 @@
int start = i, end = i + 1;
int start_bucket_index, end_bucket_index;
- if (end == tot_feather_point)
- end = 0;
+ if (end == tot_feather_point) {
+ if (spline->flag & MASK_SPLINE_CYCLIC)
+ end = 0;
+ else
+ break;
+ }
start_bucket_index = BUCKET_INDEX(feather_points[start]);
end_bucket_index = BUCKET_INDEX(feather_points[end]);
@@ -733,7 +741,7 @@
/* this is slow! - don't do on draw */
if (do_collapse) {
- spline_feather_collapse_inner_loops(feather, tot);
+ spline_feather_collapse_inner_loops(spline, feather, tot);
}
return feather;
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c 2012-07-18 11:48:13 UTC (rev 49024)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c 2012-07-18 11:49:18 UTC (rev 49025)
@@ -64,7 +64,8 @@
unsigned int *_t = face; \
BLI_assert(_t[0] < vert_max); \
BLI_assert(_t[1] < vert_max); \
- BLI_assert(_t[2] < vert_max || _t[2] == TRI_VERT); \
+ BLI_assert(_t[2] < vert_max); \
+ BLI_assert(_t[3] < vert_max || _t[3] == TRI_VERT); \
} (void)0
void rotate_point(const float cent[2], const float angle, float p[2], const float asp[2])
@@ -94,7 +95,7 @@
/* --------------------------------------------------------------------- */
/**
- * A single #MaskRasterHandle contains multile #MaskRasterLayer's,
+ * A single #MaskRasterHandle contains multiple #MaskRasterLayer's,
* each #MaskRasterLayer does its own lookup which contributes to
* the final pixel with its own blending mode and the final pixel
* is blended between these.
@@ -801,7 +802,7 @@
sf_vert_next = sf_vert->next;
copy_v3_v3(cos, sf_vert->co);
- /* remove so as not to interfear with fill (called after) */
+ /* remove so as not to interfere with fill (called after) */
if (sf_vert->keyindex == SF_KEYINDEX_TEMP_ID) {
BLI_remlink(&sf_ctx.fillvertbase, sf_vert);
}
@@ -812,13 +813,13 @@
cos += 3;
}
- /* main scanfill */
+ /* main scan-fill */
sf_tri_tot = BLI_scanfill_calc_ex(&sf_ctx, FALSE, zvec);
face_array = MEM_mallocN(sizeof(*face_array) * (sf_tri_tot + tot_feather_quads), "maskrast_face_index");
face_index = 0;
- /* tri's */
+ /* faces */
face = (unsigned int *)face_array;
for (sf_tri = sf_ctx.fillfacebase.first; sf_tri; sf_tri = sf_tri->next) {
*(face++) = sf_tri->v3->tmp.u;
Modified: branches/soc-2011-tomato/source/blender/blenlib/intern/math_matrix.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/intern/math_matrix.c 2012-07-18 11:48:13 UTC (rev 49024)
+++ branches/soc-2011-tomato/source/blender/blenlib/intern/math_matrix.c 2012-07-18 11:49:18 UTC (rev 49025)
@@ -1111,7 +1111,7 @@
/* rotation & scale are linked, we need to create the mat's
* for these together since they are related. */
- /* so scale doesnt interfear with rotation [#24291] */
+ /* so scale doesn't interfere with rotation [#24291] */
/* note: this is a workaround for negative matrix not working for rotation conversion, FIXME */
normalize_m3_m3(mat3_n, mat3);
if (is_negative_m3(mat3)) {
Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49019
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49024
Modified: branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c 2012-07-18 11:48:13 UTC (rev 49024)
+++ branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image.c 2012-07-18 11:49:18 UTC (rev 49025)
@@ -5241,7 +5241,7 @@
pixel_size = size;
}
- /* fade out the brush (cheap trick to work around brush interfearing with sampling [#])*/
+ /* fade out the brush (cheap trick to work around brush interfering with sampling [#])*/
if (pixel_size < PX_SIZE_FADE_MIN) {
return;
}
@@ -5253,7 +5253,7 @@
glTranslatef((float)x, (float)y, 0.0f);
- /* No need to scale for uv sculpting, on the contrary it might be useful to keep unscaled */
+ /* No need to scale for uv sculpting, on the contrary it might be useful to keep un-scaled */
if (use_zoom)
glScalef(zoomx, zoomy, 1.0f);
Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-49019
+ /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-49024
Modified: branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c 2012-07-18 11:48:13 UTC (rev 49024)
+++ branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c 2012-07-18 11:49:18 UTC (rev 49025)
@@ -1066,7 +1066,7 @@
/* clear so the OK button is left alone */
uiBlockSetFunc(block, NULL, NULL, NULL);
- /* new column so as not to interfear with custom layouts [#26436] */
+ /* new column so as not to interfere with custom layouts [#26436] */
{
uiBlock *col_block;
uiLayout *col;
More information about the Bf-blender-cvs
mailing list