Revision: 48971
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48971
Author: campbellbarton
Date: 2012-07-16 14:29:23 +0000 (Mon, 16 Jul 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r48967:48970
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48967
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
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/editors/interface/interface_templates.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-48967
+
/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-48970
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
2012-07-16 14:27:45 UTC (rev 48970)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
2012-07-16 14:29:23 UTC (rev 48971)
@@ -64,6 +64,9 @@
/* splines */
struct MaskSpline *BKE_mask_spline_add(struct MaskLayer *masklay);
+int BKE_mask_spline_resolution(struct MaskSpline *spline, int width, int
height);
+int BKE_mask_spline_feather_resolution(struct MaskSpline *spline, int width,
int height);
+
int BKE_mask_spline_differentiate_calc_total(const struct MaskSpline *spline,
const int resol);
float (*BKE_mask_spline_differentiate(struct MaskSpline *spline, int
*tot_diff_point))[2];
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
2012-07-16 14:27:45 UTC (rev 48970)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
2012-07-16 14:29:23 UTC (rev 48971)
@@ -261,7 +261,7 @@
return spline;
}
-static int BKE_mask_spline_resolution(MaskSpline *spline, int width, int
height)
+int BKE_mask_spline_resolution(MaskSpline *spline, int width, int height)
{
float max_segment = 0.01f;
int i, resol = 1;
@@ -299,7 +299,7 @@
return resol;
}
-static int BKE_mask_spline_feather_resolution(MaskSpline *spline, int width,
int height)
+int BKE_mask_spline_feather_resolution(MaskSpline *spline, int width, int
height)
{
const float max_segment = 0.005;
int resol = BKE_mask_spline_resolution(spline, width, height);
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-16 14:27:45 UTC (rev 48970)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask_rasterize.c
2012-07-16 14:29:23 UTC (rev 48971)
@@ -471,7 +471,6 @@
const short do_feather)
{
const rctf default_bounds = {0.0f, 1.0f, 0.0f, 1.0f};
- const int resol = SPLINE_RESOL; /* TODO: real size */
const float pixel_size = 1.0f / MIN2(width, height);
const float zvec[3] = {0.0f, 0.0f, 1.0f};
@@ -522,6 +521,10 @@
float (*diff_feather_points)[2];
int tot_diff_feather_points;
+ const int resol_a = BKE_mask_spline_resolution(spline,
width, height) / 4;
+ const int resol_b =
BKE_mask_spline_feather_resolution(spline, width, height) / 4;
+ const int resol = CLAMPIS(MAX2(resol_a, resol_b), 4,
512);
+
diff_points =
BKE_mask_spline_differentiate_with_resolution_ex(
spline, resol, &tot_diff_point);
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-48967
+ /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-48970
Modified:
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
===================================================================
---
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
2012-07-16 14:27:45 UTC (rev 48970)
+++
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
2012-07-16 14:29:23 UTC (rev 48971)
@@ -2242,13 +2242,13 @@
}
}
else if (itemptr->type == &RNA_MaskLayer) {
- split = uiLayoutSplit(sub, 0.5f, FALSE);
+ split = uiLayoutRow(sub, FALSE);
uiItemL(split, name, icon);
uiBlockSetEmboss(block, UI_EMBOSSN);
row = uiLayoutRow(split, TRUE);
- // uiItemR(row, itemptr, "alpha", 0, "", ICON_NONE); // enable
when used
+ uiItemR(row, itemptr, "alpha", 0, "", ICON_NONE); // enable
when used
uiItemR(row, itemptr, "hide", 0, "", 0);
uiItemR(row, itemptr, "hide_select", 0, "", 0);
uiItemR(row, itemptr, "hide_render", 0, "", 0);
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-48967
+
/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-48970
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
