[Bf-blender-cvs] [69a9eac2d6b] soc-2019-npr: Merge remote-tracking branch 'origin/master' into soc-2019-npr
YimingWu
noreply at git.blender.org
Thu Aug 1 09:32:37 CEST 2019
Commit: 69a9eac2d6b254275724b92bde9be85fe8ca3704
Author: YimingWu
Date: Thu Aug 1 15:14:27 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB69a9eac2d6b254275724b92bde9be85fe8ca3704
Merge remote-tracking branch 'origin/master' into soc-2019-npr
===================================================================
===================================================================
diff --cc source/blender/editors/gpencil/gpencil_brush.c
index 0d4ba8157c3,1a7422cd174..8350761de54
--- a/source/blender/editors/gpencil/gpencil_brush.c
+++ b/source/blender/editors/gpencil/gpencil_brush.c
@@@ -1765,9 -1650,8 +1765,9 @@@ static bool gpsculpt_brush_do_frame
static bool gpsculpt_brush_apply_standard(bContext *C, tGP_BrushEditData *gso)
{
ToolSettings *ts = CTX_data_tool_settings(C);
- Depsgraph *depsgraph = CTX_data_depsgraph(C);
+ Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
Object *obact = gso->object;
+ Object *ob_eval = DEG_get_evaluated_object(depsgraph, obact);
bGPdata *gpd = gso->gpd;
bool changed = false;
diff --cc source/blender/editors/object/object_add.c
index fae53bf7182,137af917f9a..fe1d1b1dd46
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@@ -2132,10 -2139,9 +2140,10 @@@ static Base *duplibase_for_convert
static int convert_exec(bContext *C, wmOperator *op)
{
Main *bmain = CTX_data_main(C);
- Depsgraph *depsgraph = CTX_data_evaluated_depsgraph(C);
+ Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
Scene *scene = CTX_data_scene(C);
ViewLayer *view_layer = CTX_data_view_layer(C);
+ View3D *v3d = CTX_wm_view3d(C);
Base *basen = NULL, *basact = NULL;
Object *ob1, *obact = CTX_data_active_object(C);
Curve *cu;
diff --cc source/blender/editors/render/render_intern.h
index 8e96e382328,50f0b53c037..5f402583da8
--- a/source/blender/editors/render/render_intern.h
+++ b/source/blender/editors/render/render_intern.h
@@@ -37,9 -37,8 +37,10 @@@ void OBJECT_OT_material_slot_select(str
void OBJECT_OT_material_slot_deselect(struct wmOperatorType *ot);
void OBJECT_OT_material_slot_copy(struct wmOperatorType *ot);
void OBJECT_OT_material_slot_move(struct wmOperatorType *ot);
+ void OBJECT_OT_material_slot_remove_unused(struct wmOperatorType *ot);
+void OBJECT_OT_lanpr_update_gp_target(struct wmOperatorType *ot);
+
void MATERIAL_OT_new(struct wmOperatorType *ot);
void TEXTURE_OT_new(struct wmOperatorType *ot);
void WORLD_OT_new(struct wmOperatorType *ot);
diff --cc source/blender/editors/render/render_ops.c
index c9b50302784,8156f48343f..3512872cb15
--- a/source/blender/editors/render/render_ops.c
+++ b/source/blender/editors/render/render_ops.c
@@@ -42,11 -42,8 +42,12 @@@ void ED_operatortypes_render(void
WM_operatortype_append(OBJECT_OT_material_slot_deselect);
WM_operatortype_append(OBJECT_OT_material_slot_copy);
WM_operatortype_append(OBJECT_OT_material_slot_move);
+ WM_operatortype_append(OBJECT_OT_material_slot_remove_unused);
+ WM_operatortype_append(OBJECT_OT_lanpr_update_gp_target);
+ /* Not working */
+ /* WM_operatortype_append(OBJECT_OT_lanpr_update_gp_source); */
+
WM_operatortype_append(MATERIAL_OT_new);
WM_operatortype_append(TEXTURE_OT_new);
WM_operatortype_append(WORLD_OT_new);
diff --cc source/blender/makesdna/DNA_object_types.h
index 52e3d299a43,d9487f4338f..beff286ab40
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@@ -176,26 -176,10 +176,26 @@@ typedef struct Object_Runtime
/** Runtime grease pencil drawing data */
struct GpencilBatchCache *gpencil_cache;
+ /** Runtime grease pencil total layers used for derived data created by modifiers */
+ int tot_layers;
+ char _pad4[4];
+ /** Runtime grease pencil derived data created by modifiers */
+ struct bGPDframe *derived_frames;
- void *_pad2; /* Padding is here for win32s unconventional stuct alignment rules. */
+ void *_pad2; /* Padding is here for win32s unconventional struct alignment rules. */
} Object_Runtime;
+typedef struct ObjectLANPR {
+ int usage;
+ char _pad[4];
+} ObjectLANPR;
+
+enum ObjectFeatureLine_Usage {
+ OBJECT_FEATURE_LINE_INHERENT = 0,
+ OBJECT_FEATURE_LINE_OCCLUSION_ONLY = (1 << 0),
+ OBJECT_FEATURE_LINE_EXCLUDE = (1 << 1),
+};
+
typedef struct Object {
ID id;
/** Animation data (must be immediately after id for utilities to use it). */
More information about the Bf-blender-cvs
mailing list