Commit: b98e6d7742e75a7ca7f286e993558066cb05aca1
Author: Antonio Vazquez
Date: Wed Jul 18 20:18:09 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBb98e6d7742e75a7ca7f286e993558066cb05aca1
Merge branch 'blender2.8' into greasepencil-object
Conflicts:
source/blender/draw/intern/draw_cache.c
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/gpencil/gpencil_brush.c
===================================================================
===================================================================
diff --cc source/blender/draw/intern/draw_cache.c
index 01cfe780673,bb73a8c1b19..1535eb64650
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@@ -47,67 -47,66 +47,67 @@@
/* Batch's only (free'd as an array) */
static struct DRWShapeCache {
- Gwn_Batch *drw_single_vertice;
- Gwn_Batch *drw_cursor;
- Gwn_Batch *drw_cursor_only_circle;
- Gwn_Batch *drw_fullscreen_quad;
- Gwn_Batch *drw_fullscreen_quad_texcoord;
- Gwn_Batch *drw_quad;
- Gwn_Batch *drw_sphere;
- Gwn_Batch *drw_screenspace_circle;
- Gwn_Batch *drw_plain_axes;
- Gwn_Batch *drw_single_arrow;
- Gwn_Batch *drw_cube;
- Gwn_Batch *drw_circle;
- Gwn_Batch *drw_square;
- Gwn_Batch *drw_line;
- Gwn_Batch *drw_line_endpoints;
- Gwn_Batch *drw_empty_cube;
- Gwn_Batch *drw_empty_sphere;
- Gwn_Batch *drw_empty_cylinder;
- Gwn_Batch *drw_empty_capsule_body;
- Gwn_Batch *drw_empty_capsule_cap;
- Gwn_Batch *drw_empty_cone;
- Gwn_Batch *drw_arrows;
- Gwn_Batch *drw_axis_names;
- Gwn_Batch *drw_image_plane;
- Gwn_Batch *drw_image_plane_wire;
- Gwn_Batch *drw_field_wind;
- Gwn_Batch *drw_field_force;
- Gwn_Batch *drw_field_vortex;
- Gwn_Batch *drw_field_tube_limit;
- Gwn_Batch *drw_field_cone_limit;
- Gwn_Batch *drw_lamp;
- Gwn_Batch *drw_lamp_shadows;
- Gwn_Batch *drw_lamp_sunrays;
- Gwn_Batch *drw_lamp_area_square;
- Gwn_Batch *drw_lamp_area_disk;
- Gwn_Batch *drw_lamp_hemi;
- Gwn_Batch *drw_lamp_spot;
- Gwn_Batch *drw_lamp_spot_square;
- Gwn_Batch *drw_speaker;
- Gwn_Batch *drw_lightprobe_cube;
- Gwn_Batch *drw_lightprobe_planar;
- Gwn_Batch *drw_lightprobe_grid;
- Gwn_Batch *drw_bone_octahedral;
- Gwn_Batch *drw_bone_octahedral_wire;
- Gwn_Batch *drw_bone_box;
- Gwn_Batch *drw_bone_box_wire;
- Gwn_Batch *drw_bone_wire_wire;
- Gwn_Batch *drw_bone_envelope;
- Gwn_Batch *drw_bone_envelope_outline;
- Gwn_Batch *drw_bone_point;
- Gwn_Batch *drw_bone_point_wire;
- Gwn_Batch *drw_bone_stick;
- Gwn_Batch *drw_bone_arrows;
- Gwn_Batch *drw_camera;
- Gwn_Batch *drw_camera_frame;
- Gwn_Batch *drw_camera_tria;
- Gwn_Batch *drw_camera_focus;
- Gwn_Batch *drw_particle_cross;
- Gwn_Batch *drw_particle_circle;
- Gwn_Batch *drw_particle_axis;
+ GPUBatch *drw_single_vertice;
+ GPUBatch *drw_cursor;
+ GPUBatch *drw_cursor_only_circle;
+ GPUBatch *drw_fullscreen_quad;
+ GPUBatch *drw_fullscreen_quad_texcoord;
+ GPUBatch *drw_quad;
+ GPUBatch *drw_sphere;
+ GPUBatch *drw_screenspace_circle;
+ GPUBatch *drw_plain_axes;
+ GPUBatch *drw_single_arrow;
+ GPUBatch *drw_cube;
+ GPUBatch *drw_circle;
+ GPUBatch *drw_square;
+ GPUBatch *drw_line;
+ GPUBatch *drw_line_endpoints;
+ GPUBatch *drw_empty_cube;
+ GPUBatch *drw_empty_sphere;
+ GPUBatch *drw_empty_cylinder;
+ GPUBatch *drw_empty_capsule_body;
+ GPUBatch *drw_empty_capsule_cap;
+ GPUBatch *drw_empty_cone;
+ GPUBatch *drw_arrows;
+ GPUBatch *drw_axis_names;
+ GPUBatch *drw_image_plane;
+ GPUBatch *drw_image_plane_wire;
+ GPUBatch *drw_field_wind;
+ GPUBatch *drw_field_force;
+ GPUBatch *drw_field_vortex;
+ GPUBatch *drw_field_tube_limit;
+ GPUBatch *drw_field_cone_limit;
+ GPUBatch *drw_lamp;
+ GPUBatch *drw_lamp_shadows;
+ GPUBatch *drw_lamp_sunrays;
+ GPUBatch *drw_lamp_area_square;
+ GPUBatch *drw_lamp_area_disk;
+ GPUBatch *drw_lamp_hemi;
+ GPUBatch *drw_lamp_spot;
+ GPUBatch *drw_lamp_spot_square;
+ GPUBatch *drw_speaker;
+ GPUBatch *drw_lightprobe_cube;
+ GPUBatch *drw_lightprobe_planar;
+ GPUBatch *drw_lightprobe_grid;
+ GPUBatch *drw_bone_octahedral;
+ GPUBatch *drw_bone_octahedral_wire;
+ GPUBatch *drw_bone_box;
+ GPUBatch *drw_bone_box_wire;
+ GPUBatch *drw_bone_wire_wire;
+ GPUBatch *drw_bone_envelope;
+ GPUBatch *drw_bone_envelope_outline;
+ GPUBatch *drw_bone_point;
+ GPUBatch *drw_bone_point_wire;
+ GPUBatch *drw_bone_stick;
+ GPUBatch *drw_bone_arrows;
+ GPUBatch *drw_camera;
+ GPUBatch *drw_camera_frame;
+ GPUBatch *drw_camera_tria;
+ GPUBatch *drw_camera_focus;
+ GPUBatch *drw_particle_cross;
+ GPUBatch *drw_particle_circle;
+ GPUBatch *drw_particle_axis;
+ Gwn_Batch *drw_gpencil_axes;
} SHC = {NULL};
void DRW_shape_cache_free(void)
@@@ -640,9 -556,9 +612,9 @@@ Gwn_Batch *DRW_cache_gpencil_axes_get(v
/* -------------------------------------------------------------------- */
/** \name Common Object API
- * \{ */
+* \{ */
- Gwn_Batch *DRW_cache_object_wire_outline_get(Object *ob)
+ GPUBatch *DRW_cache_object_wire_outline_get(Object *ob)
{
switch (ob->type) {
case OB_MESH:
diff --cc source/blender/draw/intern/draw_cache.h
index d2581baca62,129c0252f30..7746c09ba01
--- a/source/blender/draw/intern/draw_cache.h
+++ b/source/blender/draw/intern/draw_cache.h
@@@ -61,93 -60,90 +60,93 @@@ void DRW_cache_object_face_wireframe_ge
Object *ob, struct GPUTexture **r_vert_tx, struct GPUTexture
**r_faceid_tx, int *r_tri_count);
/* Empties */
- struct Gwn_Batch *DRW_cache_plain_axes_get(void);
- struct Gwn_Batch *DRW_cache_single_arrow_get(void);
- struct Gwn_Batch *DRW_cache_empty_cube_get(void);
- struct Gwn_Batch *DRW_cache_circle_get(void);
- struct Gwn_Batch *DRW_cache_square_get(void);
- struct Gwn_Batch *DRW_cache_empty_sphere_get(void);
- struct Gwn_Batch *DRW_cache_empty_cylinder_get(void);
- struct Gwn_Batch *DRW_cache_empty_cone_get(void);
- struct Gwn_Batch *DRW_cache_empty_capsule_cap_get(void);
- struct Gwn_Batch *DRW_cache_empty_capsule_body_get(void);
- struct Gwn_Batch *DRW_cache_arrows_get(void);
- struct Gwn_Batch *DRW_cache_axis_names_get(void);
- struct Gwn_Batch *DRW_cache_image_plane_get(void);
- struct Gwn_Batch *DRW_cache_image_plane_wire_get(void);
+ struct GPUBatch *DRW_cache_plain_axes_get(void);
+ struct GPUBatch *DRW_cache_single_arrow_get(void);
+ struct GPUBatch *DRW_cache_empty_cube_get(void);
+ struct GPUBatch *DRW_cache_circle_get(void);
+ struct GPUBatch *DRW_cache_square_get(void);
+ struct GPUBatch *DRW_cache_empty_sphere_get(void);
+ struct GPUBatch *DRW_cache_empty_cylinder_get(void);
+ struct GPUBatch *DRW_cache_empty_cone_get(void);
+ struct GPUBatch *DRW_cache_empty_capsule_cap_get(void);
+ struct GPUBatch *DRW_cache_empty_capsule_body_get(void);
+ struct GPUBatch *DRW_cache_arrows_get(void);
+ struct GPUBatch *DRW_cache_axis_names_get(void);
+ struct GPUBatch *DRW_cache_image_plane_get(void);
+ struct GPUBatch *DRW_cache_image_plane_wire_get(void);
/* Force Field */
- struct Gwn_Batch *DRW_cache_field_wind_get(void);
- struct Gwn_Batch *DRW_cache_field_force_get(void);
- struct Gwn_Batch *DRW_cache_field_vortex_get(void);
- struct Gwn_Batch *DRW_cache_field_tube_limit_get(void);
- struct Gwn_Batch *DRW_cache_field_cone_limit_get(void);
+ struct GPUBatch *DRW_cache_field_wind_get(void);
+ struct GPUBatch *DRW_cache_field_force_get(void);
+ struct GPUBatch *DRW_cache_field_vortex_get(void);
+ struct GPUBatch *DRW_cache_field_tube_limit_get(void);
+ struct GPUBatch *DRW_cache_field_cone_limit_get(void);
+/* Grease Pencil */
+struct Gwn_Batch *DRW_cache_gpencil_axes_get(void);
+
/* Lamps */
- struct Gwn_Batch *DRW_cache_lamp_get(void);
- struct Gwn_Batch *DRW_cache_lamp_shadows_get(void);
- struct Gwn_Batch *DRW_cache_lamp_sunrays_get(void);
- struct Gwn_Batch *DRW_cache_lamp_area_square_get(void);
- struct Gwn_Batch *DRW_cache_lamp_area_disk_get(void);
- struct Gwn_Batch *DRW_cache_lamp_hemi_get(void);
- struct Gwn_Batch *DRW_cache_lamp_spot_get(void);
- struct Gwn_Batch *DRW_cache_lamp_spot_square_get(void);
+ struct GPUBatch *DRW_cache_lamp_get(void);
+ struct GPUBatch *DRW_cache_lamp_shadows_get(void);
+ struct GPUBatch *DRW_cache_lamp_sunrays_get(void);
+ struct GPUBatch *DRW_cache_lamp_area_square_get(void);
+ struct GPUBatch *DRW_cache_lamp_area_disk_get(void);
+ struct GPUBatch *DRW_cache_lamp_hemi_get(void);
+ struct GPUBatch *DRW_cache_lamp_spot_get(void);
+ struct GPUBatch *DRW_cache_lamp_spot_square_get(void);
/* Camera */
- struct Gwn_Batch *DRW_cache_camera_get(void);
- struct Gwn_Batch *DRW_cache_camera_frame_get(void);
- struct Gwn_Batch *DRW_cache_camera_tria_get(void);
+ struct GPUBatch *DRW_cache_camera_get(void);
+ struct GPUBatch *DRW_cache_camera_frame_get(void);
+ struct GPUBatch *DRW_cache_camera_tria_get(void);
/* Speaker */
- struct Gwn_Batch *DRW_cache_speaker_get(void);
+ struct GPUBatch *DRW_cache_speaker_get(void);
/* Probe */
- struct Gwn_Batch *DRW_cache_lightprobe_cube_get(void);
- struct Gwn_Batch *DRW_cache_lightprobe_grid_get(void);
- struct Gwn_Batch *DRW_cache_lightprobe_planar_get(void);
+ struct GPUBatch *DRW_cache_lightprobe_cube_get(void);
+ struct GPUBatch *DRW_cache_lightprobe_grid_get(void);
+ struct GPUBatch *DRW_cache_lightprobe_planar_get(void);
/* Bones */
- struct Gwn_Batch *DRW_cache_bone_octahedral_get(void);
- struct Gwn_Batch *DRW_cache_bone_octahedral_wire_get(void);
- struct Gwn_Batch *DRW_cache_bone_box_get(void);
- struct Gwn_Batch *DRW_cache_bone_box_wire_get(void);
- struct Gwn_Batch *DRW_cache_bone_envelope_solid_get(void);
- struct Gwn_Batch *DRW_cache_bone_envelope_outline_get(void);
- struct Gwn_Batch *DRW_cache_bone_envelope_head_wire_outline_get(void);
- struct Gwn_Batch *DRW_cache_bone_point_get(void);
- struct Gwn_Batch *DRW_cache_bone_point_wire_outline_get(void);
- struct Gwn_Batch *DRW_cache_bone_stick_get(void);
- struct Gwn_Batch *DRW_cache_bone_arrows_get(void);
+ struct GPUBatch *DRW_cache_bone_octahedral_get(void);
+ struct GPUBatch *DRW_cache_bone_octahedral_wire_get(void);
+ struct GPUBatch *DRW_cache_bone_box_get(void);
+ struct GPUBatch *DRW_cache_bone_box_wire_get(void);
+ struct GPUBatch *DRW_cache_bone_envelope_solid_get(void);
+ struct GPUBatch *DRW_cache_bone_envelope_outline_get(void);
+ struct GPUBatch *DRW_cache_bone_envelope_head_wire_outline_get(void);
+ struct GPUBatch *DRW_cache_bone_point_get(void);
+ struct GPUBatch *DRW_cache_bone_point_wire_outline_get(void);
+ struct GPUBatch *DRW_cache_bone_stick_get(void);
+ struct GPUBatch *DRW_cache_bone_arrows_get(void);
/* Meshes */
- struct Gwn_Batch *DRW_cache_mesh_surface_overlay_get(struct Object *ob);
+ struct GPUBatch *DRW_cache_mesh_surface_overlay_get(struct Object *ob);
void DRW_cache_mesh_wire_overlay_get(
struct Object *ob,
-
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
