diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-12 18:20:12 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-12 18:20:12 +0300 |
commit | e8dd4cd9cabb76f00838a975627c571a4fccdb18 (patch) | |
tree | b25df215d8c834bd92e1b5aa061ded1f8b3f69b3 /source/blender/editors | |
parent | 2af7c38682d6d4fd87bd175dd90e40f15591ec5c (diff) |
Cleanup: warning, spaces
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/interface/interface_templates.c | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_stroke.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 45069ada92f..70b591d3a69 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -2266,7 +2266,7 @@ void uiTemplateIconView(uiLayout *layout, PointerRNA *ptr, const char *propname, value = RNA_property_enum_get(ptr, prop); RNA_enum_icon_from_value(items, value, &icon); - + if (RNA_property_editable(ptr, prop)) { cb_args = MEM_callocN(sizeof(IconViewMenuArgs), __func__); cb_args->ptr = *ptr; diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index 2e16ddb628f..a7aa19807dd 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -409,7 +409,7 @@ static bool paint_brush_update(bContext *C, if ((do_random || do_random_mask) && stroke->rng == NULL) { /* Lazy initialization. */ uint rng_seed = (uint)(PIL_check_seconds_timer_i() & UINT_MAX); - rng_seed ^= (uint)(brush); + rng_seed ^= (uint)GET_INT_FROM_POINTER(brush); stroke->rng = BLI_rng_new(rng_seed); } |