Commit: b7067088fe9d5525c1a12ad543284aaa6061679b
Author: Antonio Vazquez
Date: Tue Jun 4 10:40:35 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb7067088fe9d5525c1a12ad543284aaa6061679b
Merge branch 'master' into greasepencil-object
Conflicts:
source/blender/draw/engines/gpencil/gpencil_draw_utils.c
===================================================================
===================================================================
diff --cc source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 8b7b2ff4175,cd35395064b..e4c678675ef
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@@ -1009,8 -1020,7 +1009,7 @@@ static void gpencil_draw_strokes(Gpenci
const DRWContextState *draw_ctx = DRW_context_state_get();
Scene *scene = draw_ctx->scene;
View3D *v3d = draw_ctx->v3d;
- bGPDstroke *gps, *src_gps;
+ bGPDstroke *gps;
- float viewmatrix[4][4];
const bool is_multiedit = (bool)GPENCIL_MULTIEDIT_SESSIONS_ON(gpd);
const bool playing = stl->storage->is_playing;
const bool is_render = (bool)stl->storage->is_render;
@@@ -1024,14 -1034,30 +1023,14 @@@
Depsgraph *depsgraph = DRW_context_state_get()->depsgraph;
/* get parent matrix and save as static data */
- ED_gpencil_parent_location(depsgraph, ob, gpd, gpl, viewmatrix);
- copy_m4_m4(gpf->runtime.viewmatrix, viewmatrix);
-
if ((cache_ob != NULL) && (cache_ob->is_dup_ob)) {
- copy_m4_m4(gpf->runtime.viewmatrix, cache_ob->obmat);
- copy_m4_m4(derived_gpf->runtime.parent_obmat, cache_ob->obmat);
++ copy_m4_m4(gpf->runtime.parent_obmat, cache_ob->obmat);
+ }
+ else {
- ED_gpencil_parent_location(depsgraph, ob, gpd, gpl,
derived_gpf->runtime.parent_obmat);
++ ED_gpencil_parent_location(depsgraph, ob, gpd, gpl,
gpf->runtime.parent_obmat);
}
- /* apply geometry modifiers */
- if ((cache->is_dirty) && (ob->greasepencil_modifiers.first) &&
(!is_multiedit)) {
- if (!stl->storage->simplify_modif) {
- if (BKE_gpencil_has_geometry_modifiers(ob)) {
- BKE_gpencil_geometry_modifiers(depsgraph, ob, gpl, derived_gpf,
stl->storage->is_render);
- }
- }
- }
-
- if (src_gpf) {
- src_gps = src_gpf->strokes.first;
- }
- else {
- src_gps = NULL;
- }
-
- for (gps = derived_gpf->strokes.first; gps; gps = gps->next) {
+ for (gps = gpf->strokes.first; gps; gps = gps->next) {
MaterialGPencilStyle *gp_style = BKE_material_gpencil_settings_get(ob,
gps->mat_nr + 1);
/* check if stroke can be drawn */
@@@ -1050,7 -1078,8 +1049,8 @@@
(scene->r.simplify_gpencil & SIMPLIFY_GPENCIL_REMOVE_FILL_LINE)) {
if ((gp_style->fill_rgba[3] > GPENCIL_ALPHA_OPACITY_THRESH) ||
(gp_style->fill_style > GP_STYLE_FILL_STYLE_SOLID) ||
- (gpl->blend_mode != eGplBlendMode_Normal)) {
+ (gpl->blend_mode != eGplBlendMode_Regular)) {
- GP_SET_SRC_GPS(src_gps);
++
continue;
}
}
@@@ -1060,8 -1090,16 +1060,8 @@@
copy_v4_v4(gps->runtime.tmp_stroke_rgba, gp_style->stroke_rgba);
copy_v4_v4(gps->runtime.tmp_fill_rgba, gp_style->fill_rgba);
- /* apply modifiers (only modify geometry, but not create ) */
- if ((cache->is_dirty) && (ob->greasepencil_modifiers.first) &&
(!is_multiedit)) {
- if (!stl->storage->simplify_modif) {
- BKE_gpencil_stroke_modifiers(
- depsgraph, ob, gpl, derived_gpf, gps, stl->storage->is_render);
- }
- }
-
/* hide any blend layer */
- if ((!stl->storage->simplify_blend) || (gpl->blend_mode ==
eGplBlendMode_Normal)) {
+ if ((!stl->storage->simplify_blend) || (gpl->blend_mode ==
eGplBlendMode_Regular)) {
/* fill */
if ((gp_style->flag & GP_STYLE_FILL_SHOW) &&
(!stl->storage->simplify_fill) &&
((gps->flag & GP_STROKE_NOFILL) == 0)) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
