[Bf-blender-cvs] [d314cbe06de] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object
Antonio Vazquez
noreply at git.blender.org
Fri Jan 19 16:41:14 CET 2018
Commit: d314cbe06de3de502e1857375eb639dd5ed96d59
Author: Antonio Vazquez
Date: Fri Jan 19 16:31:03 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rBd314cbe06de3de502e1857375eb639dd5ed96d59
Merge branch 'blender2.8' into greasepencil-object
Conflicts:
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/include/ED_gpencil.h
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_view3d/view3d_draw_legacy.c
===================================================================
===================================================================
diff --cc source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
index 003414cec93,4ca19f4e14f..690a4ef6443
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_view_layer.cc
@@@ -144,14 -144,8 +144,14 @@@ void DepsgraphNodeBuilder::build_view_l
if (scene->gpd != NULL) {
build_gpencil(scene->gpd);
}
+
+ /* Palettes. */
+ LINKLIST_FOREACH(Palette *, palette, &bmain_->palettes) {
+ build_palette(palette);
+ }
+
/* Cache file. */
- LINKLIST_FOREACH (CacheFile *, cachefile, &bmain_->cachefiles) {
+ BLI_LISTBASE_FOREACH (CacheFile *, cachefile, &bmain_->cachefiles) {
build_cachefile(cachefile);
}
/* Masks. */
diff --cc source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
index 2728a122e53,cfb98fe2f79..1fc7d92c575
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
@@@ -104,14 -104,8 +104,14 @@@ void DepsgraphRelationBuilder::build_vi
if (scene->gpd != NULL) {
build_gpencil(scene->gpd);
}
+
+ /* Palettes. */
+ LINKLIST_FOREACH(Palette *, palette, &bmain_->palettes) {
+ build_palette(palette);
+ }
+
/* Masks. */
- LINKLIST_FOREACH (Mask *, mask, &bmain_->mask) {
+ BLI_LISTBASE_FOREACH (Mask *, mask, &bmain_->mask) {
build_mask(mask);
}
/* Movie clips. */
diff --cc source/blender/editors/include/ED_gpencil.h
index 9c2ddd0313d,3ea754b242c..9b93b69db5d
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@@ -32,66 -32,30 +32,66 @@@
#include "ED_numinput.h"
+ struct ID;
+ struct ListBase;
+ struct bContext;
+ struct Depsgraph;
+ struct ScrArea;
struct ARegion;
-struct View3D;
-struct Object;
+struct bAnimContext;
- struct bContext;
+struct wmOperator;
struct bGPdata;
struct bGPDlayer;
struct bGPDframe;
struct bGPDstroke;
struct bGPDpalette;
struct bGPDpalettecolor;
-struct bAnimContext;
+struct bGPDspoint;
+struct tGPDdraw;
- struct ID;
+struct Image;
+struct BLI_Stack;
struct KeyframeEditData;
- struct ListBase;
+struct Object;
+struct Palette;
+struct PaletteColor;
struct PointerRNA;
+struct RegionView3D;
- struct ScrArea;
+struct ToolSettings;
+struct View3D;
struct Scene;
struct ViewLayer;
struct wmWindowManager;
struct wmKeyConfig;
-
+struct wmWindowManager;
+struct EvaluationContext;
- struct Depsgraph;
+struct wmWindow;
+struct rcti;
/* ------------- Grease-Pencil Helpers ---------------- */
+
+/* Temporary draw data (no draw manager mode) */
+typedef struct tGPDdraw {
+ struct RegionView3D *rv3d; /* region to draw */
+ struct Object *ob; /* object */
+ struct bGPdata *gpd; /* current GP datablock */
+ struct bGPDlayer *gpl; /* layer */
+ struct bGPDframe *gpf; /* frame */
+ struct bGPDframe *t_gpf; /* temporal frame */
+ struct bGPDstroke *gps; /* stroke */
+ int disable_fill; /* disable fill */
+ int offsx; /* windows offset x */
+ int offsy; /* windows offset y */
+ int winx; /* windows width */
+ int winy; /* windows height */
+ int dflag; /* flags datablock */
+ short lthick; /* layer thickness */
+ float opacity; /* opacity */
+ float tintcolor[4]; /* tint color */
+ bool onion; /* onion flag */
+ bool custonion; /* use custom onion colors */
+ float diff_mat[4][4]; /* matrix */
+} tGPDdraw;
+
typedef struct tGPDinterpolate_layer {
struct tGPDinterpolate_layer *next, *prev;
diff --cc source/blender/editors/space_outliner/outliner_draw.c
index eb57a94f7e1,c903a5026cf..5e95c013f5e
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@@ -1128,18 -1108,16 +1128,23 @@@ static void tselem_draw_icon(uiBlock *b
ICON_DRAW(icon);
}
break;
+ case TSE_LAYER_COLLECTION:
+ case TSE_SCENE_COLLECTION:
+ ICON_DRAW(ICON_COLLAPSEMENU);
+ break;
+ /* Removed the icons from outliner. Need a better structure with Layers, Palettes and Colors */
-#if 0
case TSE_GP_LAYER:
- tselem_draw_gp_icon_uibut(&arg, tselem->id, te->directdata);
+ {
+ /* indicate whether layer is active */
+ bGPDlayer *gpl = te->directdata;
+ if (gpl->flag & GP_LAYER_ACTIVE) {
+ ICON_DRAW(ICON_GREASEPENCIL);
+ }
+ else {
+ ICON_DRAW(ICON_DOT);
+ }
break;
-#endif
+ }
default:
ICON_DRAW(ICON_DOT);
break;
diff --cc source/blender/editors/space_view3d/view3d_draw_legacy.c
index 79bea9f0673,7cb362ffb92..f440d2533ac
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@@ -2139,11 -2055,7 +2144,11 @@@ static void view3d_main_region_draw_inf
if (v3d->flag2 & V3D_SHOW_GPENCIL) {
/* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */
- ED_gpencil_draw_view3d(wm, scene, view_layer, v3d, ar, false);
+ ED_gpencil_draw_view3d(wm, scene, view_layer, depsgraph, v3d, ar, false);
+ Object *obact = CTX_data_active_object(C);
+ if (obact && obact->type == OB_GPENCIL) {
+ ED_gpencil_draw_view3d_object(wm, scene, obact, v3d, ar, false);
+ }
}
if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
More information about the Bf-blender-cvs
mailing list