Commit: c0bb7ba1441675b9449a43ab129fa16bb33fcf19
Author: Antonio Vazquez
Date: Tue Jun 13 17:00:26 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBc0bb7ba1441675b9449a43ab129fa16bb33fcf19
Merge branch 'blender2.8' into greasepencil-object
===================================================================
===================================================================
diff --cc source/blender/blenkernel/intern/object.c
index 07ad1359dbe,b1d2573f0e8..221bd679232
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@@ -605,9 -604,8 +605,9 @@@ void *BKE_object_obdata_add_from_type(M
case OB_LATTICE: return BKE_lattice_add(bmain, name);
case OB_ARMATURE: return BKE_armature_add(bmain, name);
case OB_SPEAKER: return BKE_speaker_add(bmain, name);
- case OB_PROBE: return BKE_probe_add(bmain, name);
+ case OB_LIGHTPROBE:return BKE_lightprobe_add(bmain, name);
case OB_EMPTY: return NULL;
+ case OB_GPENCIL: return NULL;
default:
printf("%s: Internal error, bad type: %d\n", __func__,
type);
return NULL;
diff --cc source/blender/blenloader/intern/versioning_280.c
index 2ef1e5cb292,e9146ba86dd..0e9312b5ae2
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -39,7 -39,7 +39,8 @@@
#include "DNA_screen_types.h"
#include "DNA_view3d_types.h"
#include "DNA_genfile.h"
+#include "DNA_gpencil_types.h"
+ #include "DNA_workspace_types.h"
#include "BKE_collection.h"
#include "BKE_customdata.h"
diff --cc source/blender/draw/CMakeLists.txt
index f84727315d5,35df504fa58..f82ad5f9a21
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -83,14 -83,10 +83,14 @@@ set(SR
engines/eevee/eevee_data.c
engines/eevee/eevee_engine.c
engines/eevee/eevee_lights.c
+ engines/eevee/eevee_lightprobes.c
engines/eevee/eevee_materials.c
- engines/eevee/eevee_probes.c
engines/eevee/eevee_effects.c
engines/external/external_engine.c
+ engines/gpencil/gpencil_engine.h
+ engines/gpencil/gpencil_engine.c
+ engines/gpencil/gpencil_draw_cache_impl.c
+ engines/gpencil/gpencil_geom.c
DRW_engine.h
intern/DRW_render.h
diff --cc source/blender/editors/include/UI_icons.h
index 179e5c45cdc,0c83038b7a3..54bd2cad0f1
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@@ -313,10 -313,10 +313,10 @@@ DEF_ICON(OUTLINER_OB_ARMATURE
DEF_ICON(OUTLINER_OB_FONT)
DEF_ICON(OUTLINER_OB_SURFACE)
DEF_ICON(OUTLINER_OB_SPEAKER)
+ DEF_ICON(OUTLINER_OB_FORCE_FIELD)
+ DEF_ICON(OUTLINER_OB_GROUP_INSTANCE)
+DEF_ICON(OUTLINER_OB_GPENCIL)
#ifndef DEF_ICON_BLANK_SKIP
- DEF_ICON(BLANK121)
-- DEF_ICON(BLANK122)
DEF_ICON(BLANK123)
DEF_ICON(BLANK124)
DEF_ICON(BLANK125)
diff --cc source/blender/editors/object/object_intern.h
index 3ea69a71a0a,f6fb3cc75b8..8cc95f8c8de
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@@ -112,9 -112,8 +112,9 @@@ void OBJECT_OT_metaball_add(struct wmOp
void OBJECT_OT_text_add(struct wmOperatorType *ot);
void OBJECT_OT_armature_add(struct wmOperatorType *ot);
void OBJECT_OT_empty_add(struct wmOperatorType *ot);
- void OBJECT_OT_probe_add(struct wmOperatorType *ot);
+ void OBJECT_OT_lightprobe_add(struct wmOperatorType *ot);
void OBJECT_OT_drop_named_image(struct wmOperatorType *ot);
+void OBJECT_OT_gpencil_add(struct wmOperatorType *ot);
void OBJECT_OT_lamp_add(struct wmOperatorType *ot);
void OBJECT_OT_effector_add(struct wmOperatorType *ot);
void OBJECT_OT_camera_add(struct wmOperatorType *ot);
diff --cc source/blender/editors/object/object_ops.c
index 60da05802bb,ca02457ba39..9bca23aac5a
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@@ -107,9 -107,8 +107,9 @@@ void ED_operatortypes_object(void
WM_operatortype_append(OBJECT_OT_text_add);
WM_operatortype_append(OBJECT_OT_armature_add);
WM_operatortype_append(OBJECT_OT_empty_add);
- WM_operatortype_append(OBJECT_OT_probe_add);
+ WM_operatortype_append(OBJECT_OT_lightprobe_add);
WM_operatortype_append(OBJECT_OT_drop_named_image);
+ WM_operatortype_append(OBJECT_OT_gpencil_add);
WM_operatortype_append(OBJECT_OT_lamp_add);
WM_operatortype_append(OBJECT_OT_camera_add);
WM_operatortype_append(OBJECT_OT_speaker_add);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
