Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / datafiles / CMakeLists.txt
index 3f6de14180a7ce7c21ce89f2199b481eee85cbae..65c55b6cd229ff88a57c500c285eb72113b1156b 100644 (file)
@@ -152,6 +152,7 @@ set(ICON_NAMES
        pose_hlt
        particlemode
        lightpaint
+       greasepencil_stroke_paint
        scene_data
        renderlayers
        world_data
@@ -194,6 +195,7 @@ set(ICON_NAMES
        library_data_indirect
        greasepencil
        line_data
+       library_data_override
        group_bone
        group_vertex
        group_vcol
@@ -213,6 +215,7 @@ set(ICON_NAMES
        outliner_ob_speaker
        outliner_ob_force_field
        outliner_ob_group_instance
+       outliner_ob_greasepencil
        restrict_color_off
        restrict_color_on
        restrict_view_off
@@ -233,6 +236,7 @@ set(ICON_NAMES
        outliner_data_surface
        outliner_data_speaker
        outliner_data_pose
+       outliner_data_greasepencil
        mesh_plane
        mesh_cube
        mesh_circle
@@ -422,6 +426,7 @@ set(ICON_NAMES
        clipuv_hlt
        snap_peel_object
        grid
+       object_origin
        pastedown
        copydown
        pasteflipup