kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix minor glitches in GP code.

Browse Source 
Reported by coverity scan.
This commit is contained in:
Bastien Montagne 2017-01-20 18:46:06 +01:00
parent a97ec403c2
commit 475d536f72
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/gpencil/drawgpencil.c
View File

@ -1563,7 +1563,7 @@ static void gp_draw_data_all(Scene *scene, bGPdata *gpd, int offsx, int offsy, i
{ {
bGPdata *gpd_source = NULL; bGPdata *gpd_source = NULL;
ToolSettings *ts; ToolSettings *ts;
bGPDbrush *brush; bGPDbrush *brush = NULL;
if (scene) { if (scene) {
ts = scene->toolsettings; ts = scene->toolsettings;
brush = BKE_gpencil_brush_getactive(ts); brush = BKE_gpencil_brush_getactive(ts);
@ -1572,8 +1572,7 @@ static void gp_draw_data_all(Scene *scene, bGPdata *gpd, int offsx, int offsy, i
BKE_gpencil_brush_init_presets(ts); BKE_gpencil_brush_init_presets(ts);
brush = BKE_gpencil_brush_getactive(ts); brush = BKE_gpencil_brush_getactive(ts);
} }
}
if (scene) {
if (spacetype == SPACE_VIEW3D) { if (spacetype == SPACE_VIEW3D) {
gpd_source = (scene->gpd ? scene->gpd : NULL); gpd_source = (scene->gpd ? scene->gpd : NULL);
} }
@ -1581,13 +1580,12 @@ static void gp_draw_data_all(Scene *scene, bGPdata *gpd, int offsx, int offsy, i
/* currently drawing only gpencil data from either clip or track, but not both - XXX fix logic behind */ /* currently drawing only gpencil data from either clip or track, but not both - XXX fix logic behind */
gpd_source = (scene->clip->gpd ? scene->clip->gpd : NULL); gpd_source = (scene->clip->gpd ? scene->clip->gpd : NULL);
} }
if (gpd_source) { if (gpd_source) {
if (brush != NULL) { if (brush != NULL) {
gp_draw_data(brush, ts->gp_sculpt.alpha, gpd_source, gp_draw_data(brush, ts->gp_sculpt.alpha, gpd_source,
offsx, offsy, winx, winy, cfra, dflag); offsx, offsy, winx, winy, cfra, dflag);
} }
} }
} }

4
source/blender/editors/gpencil/gpencil_interpolate.c
View File

@ -735,7 +735,7 @@ static float gp_interpolate_seq_easing_calc(GP_Interpolate_Settings *ipo_setting
} }
break; break;
case BEZT_IPO_CIRC: case GP_IPO_CIRC:
switch (easing) { switch (easing) {
case BEZT_IPO_EASE_IN: case BEZT_IPO_EASE_IN:
result = BLI_easing_circ_ease_in(time, begin, change, duration); result = BLI_easing_circ_ease_in(time, begin, change, duration);
@ -753,7 +753,7 @@ static float gp_interpolate_seq_easing_calc(GP_Interpolate_Settings *ipo_setting
} }
break; break;
case BEZT_IPO_CUBIC: case GP_IPO_CUBIC:
switch (easing) { switch (easing) {
case BEZT_IPO_EASE_IN: case BEZT_IPO_EASE_IN:
result = BLI_easing_cubic_ease_in(time, begin, change, duration); result = BLI_easing_cubic_ease_in(time, begin, change, duration);