diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 06:05:32 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-15 06:05:32 +0400 |
| commit | e59ab6486f9e7285815671044b785c28365d5165 (patch) | |
| tree | 4a9406c8181a817a8b96243ae167acc740ed20f7 /release | |
| parent | 35ab6cabbf62187290e417dba6d8b18cd4fe18de (diff) | |
| parent | b1019a56b54294fc91293c5c43ef46d54950ae84 (diff) | |
svn merge -r41751:41779 ^/trunk/blender
Diffstat (limited to 'release')
| -rw-r--r-- | release/plugins/sequence/dnr.c | 2 | ||||
| -rw-r--r-- | release/plugins/sequence/gamma.c | 8 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/release/plugins/sequence/dnr.c b/release/plugins/sequence/dnr.c index 606ec19ef41..74b3a06ccbb 100644 --- a/release/plugins/sequence/dnr.c +++ b/release/plugins/sequence/dnr.c @@ -42,7 +42,7 @@ struct my_data { }; void plugin_seq_doit(Cast *, float, float, int, int, - ImBuf *, ImBuf *, ImBuf *, ImBuf *); + ImBuf *, ImBuf *, ImBuf *, ImBuf *); int plugin_seq_getversion(void) { return B_PLUGIN_VERSION;} diff --git a/release/plugins/sequence/gamma.c b/release/plugins/sequence/gamma.c index 7ce86fff347..1560c5805df 100644 --- a/release/plugins/sequence/gamma.c +++ b/release/plugins/sequence/gamma.c @@ -117,13 +117,13 @@ void plugin_seq_doit(Cast *cast, float facf0, float facf1, int width, src1= (unsigned char *) ibuf1->rect; make_gamma_table(cast->setup_m, cast->gain_m, cast->gamma_m, - gamma_table_m); + gamma_table_m); make_gamma_table(cast->setup_r, cast->gain_r, cast->gamma_r, - gamma_table_r); + gamma_table_r); make_gamma_table(cast->setup_g, cast->gain_g, cast->gamma_g, - gamma_table_g); + gamma_table_g); make_gamma_table(cast->setup_b, cast->gain_b, cast->gamma_b, - gamma_table_b); + gamma_table_b); for (y = 0; y < height; y++) { for (x = 0; x < width; x++) { diff --git a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py index f03d4793be0..a934e103c35 100644 --- a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py +++ b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py @@ -414,6 +414,7 @@ class PHYSICS_PT_dp_brush_source(PhysicButtonsPanel, Panel): sub.prop(brush, "proximity_project") elif brush.paint_source == 'VOLUME_DISTANCE': sub.prop(brush, "proximity_inverse") + sub.prop(brush, "negate_volume") sub = split.column() if brush.paint_source == 'DISTANCE': |