blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Initial Grease Pencil 3.0 stage #106848

Merged
Falk David merged 224 commits from filedescriptor/blender:grease-pencil-v3 into main 2023-05-30 11:14:22 +02:00
Conversation 8 Commits 224 Files Changed 94 +11
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dd364090c5 - Show all commits

1
source/blender/editors/object/CMakeLists.txt
View File

@ -78,6 +78,7 @@ endif()
if(WITH_EXPERIMENTAL_FEATURES) if(WITH_EXPERIMENTAL_FEATURES)
add_definitions(-DWITH_SIMULATION_DATABLOCK) add_definitions(-DWITH_SIMULATION_DATABLOCK)
add_definitions(-DWITH_POINT_CLOUD) add_definitions(-DWITH_POINT_CLOUD)
add_definitions(-DWITH_GREASE_PENCIL_V3)
endif() endif()
blender_add_lib(bf_editor_object "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") blender_add_lib(bf_editor_object "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")

10
source/blender/editors/object/object_add.cc
View File

@ -2768,8 +2768,16 @@ static const EnumPropertyItem convert_target_items[] = {
{OB_GPENCIL_LEGACY, {OB_GPENCIL_LEGACY,
"GPENCIL", "GPENCIL",
ICON_OUTLINER_OB_GREASEPENCIL, ICON_OUTLINER_OB_GREASEPENCIL,
#ifdef WITH_GREASE_PENCIL_V3
"Grease Pencil (legacy)", "Grease Pencil (legacy)",
#else
"Grease Pencil",
#endif
#ifdef WITH_GREASE_PENCIL_V3
"Grease Pencil (legacy) from Curve or Mesh objects"}, "Grease Pencil (legacy) from Curve or Mesh objects"},
#else
"Grease Pencil from Curve or Mesh objects"},
#endif
#ifdef WITH_POINT_CLOUD #ifdef WITH_POINT_CLOUD
{OB_POINTCLOUD, {OB_POINTCLOUD,
"POINTCLOUD", "POINTCLOUD",
@ -2778,11 +2786,13 @@ static const EnumPropertyItem convert_target_items[] = {
"Point Cloud from Mesh objects"}, "Point Cloud from Mesh objects"},
#endif #endif
{OB_CURVES, "CURVES", ICON_OUTLINER_OB_CURVES, "Curves", "Curves from evaluated curve data"}, {OB_CURVES, "CURVES", ICON_OUTLINER_OB_CURVES, "Curves", "Curves from evaluated curve data"},
#ifdef WITH_GREASE_PENCIL_V3
{OB_GREASE_PENCIL, {OB_GREASE_PENCIL,
"GREASEPENCIL", "GREASEPENCIL",
ICON_OUTLINER_OB_GREASEPENCIL, ICON_OUTLINER_OB_GREASEPENCIL,
"Grease Pencil", "Grease Pencil",
"Grease Pencil from Grease Pencil (legacy)"}, "Grease Pencil from Grease Pencil (legacy)"},
#endif
{0, nullptr, 0, nullptr, nullptr}, {0, nullptr, 0, nullptr, nullptr},
}; };