[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61015] trunk/blender/source/blender/ editors: fix for uninitialized value use in newly added fcurve normalized view.
Campbell Barton
ideasman42 at gmail.com
Wed Oct 30 23:13:28 CET 2013
Revision: 61015
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61015
Author: campbellbarton
Date: 2013-10-30 22:13:28 +0000 (Wed, 30 Oct 2013)
Log Message:
-----------
fix for uninitialized value use in newly added fcurve normalized view.
also quiet warning without openmp.
Modified Paths:
--------------
trunk/blender/source/blender/editors/animation/anim_draw.c
trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c
Modified: trunk/blender/source/blender/editors/animation/anim_draw.c
===================================================================
--- trunk/blender/source/blender/editors/animation/anim_draw.c 2013-10-30 22:03:59 UTC (rev 61014)
+++ trunk/blender/source/blender/editors/animation/anim_draw.c 2013-10-30 22:13:28 UTC (rev 61015)
@@ -377,7 +377,7 @@
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;
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c 2013-10-30 22:03:59 UTC (rev 61014)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_mask.c 2013-10-30 22:13:28 UTC (rev 61015)
@@ -165,7 +165,9 @@
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 @@
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;
More information about the Bf-blender-cvs
mailing list