diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-10-31 02:13:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-31 02:13:28 +0400 |
| commit | bced18155ffc525dc513d097245fe3954acbb900 (patch) | |
| tree | 0fe383cdc8cae39ceee343a51b669b2b30b6a9c3 | |
| parent | 1a746911d653c7abe6960df4ff5491ebd92e756a (diff) | |
fix for uninitialized value use in newly added fcurve normalized view.
also quiet warning without openmp.
| -rw-r--r-- | source/blender/editors/animation/anim_draw.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_mask.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index dcf9c8e623b..25fcd76b513 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -377,7 +377,7 @@ short ANIM_get_normalization_flags(bAnimContext *ac) static float normalzation_factor_get(FCurve *fcu, short flag) { - float factor; + float factor = 1.0f; if (flag & ANIM_UNITCONV_RESTORE) { return 1.0f / fcu->prev_norm_factor; diff --git a/source/blender/editors/sculpt_paint/paint_mask.c b/source/blender/editors/sculpt_paint/paint_mask.c index 2e9efcc02b2..87e267b1072 100644 --- a/source/blender/editors/sculpt_paint/paint_mask.c +++ b/source/blender/editors/sculpt_paint/paint_mask.c @@ -165,7 +165,9 @@ static int is_effected(float planes[4][4], const float co[3]) int do_sculpt_mask_box_select(ViewContext *vc, rcti *rect, bool select, bool UNUSED(extend)) { +#ifdef _OPENMP Sculpt *sd = vc->scene->toolsettings->sculpt; +#endif BoundBox bb; bglMats mats = {{0}}; float clip_planes[4][4]; @@ -198,7 +200,7 @@ int do_sculpt_mask_box_select(ViewContext *vc, rcti *rect, bool select, bool UNU sculpt_undo_push_begin("Mask box fill"); - #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) +#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) for (i = 0; i < totnode; i++) { PBVHVertexIter vi; |