[Bf-blender-cvs] [a9482038ed6] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: a9482038ed6bc41b4e61e2d79d4243cf4879e7b1
Author: Antonio Vazquez
Date:   Thu Nov 16 18:48:29 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBa9482038ed6bc41b4e61e2d79d4243cf4879e7b1

Merge branch 'blender2.8' into greasepencil-object

===================================================================



===================================================================

diff --cc source/blender/blenkernel/intern/object_update.c
index 8799ef2799f,9c235fb8d8c..f3125396f16
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@@ -58,9 -58,9 +58,10 @@@
  #include "BKE_pointcache.h"
  #include "BKE_scene.h"
  #include "BKE_material.h"
+ #include "BKE_mball.h"
  #include "BKE_mesh.h"
  #include "BKE_image.h"
 +#include "BKE_gpencil.h"
  
  #include "MEM_guardedalloc.h"
  #include "DEG_depsgraph.h"
@@@ -323,9 -323,9 +324,12 @@@ void BKE_object_eval_uber_data(const Ev
  		case OB_SURF:
  			BKE_curve_batch_cache_dirty(ob->data, BKE_CURVE_BATCH_DIRTY_ALL);
  			break;
+ 		case OB_MBALL:
+ 			BKE_mball_batch_cache_dirty(ob->data, BKE_MBALL_BATCH_DIRTY_ALL);
+ 			break;
 +		case OB_GPENCIL:
 +			BKE_gpencil_batch_cache_dirty(ob->data);
 +			break;
  	}
  
  	if (DEG_depsgraph_use_copy_on_write()) {
diff --cc source/blender/draw/intern/draw_manager.c
index b130c4034eb,672149b9e43..6342d6c62fa
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -3811,10 -3804,10 +3813,13 @@@ void DRW_engines_register(void
  		/* BKE: particle.c */
  		extern void *BKE_particle_batch_cache_dirty_cb;
  		extern void *BKE_particle_batch_cache_free_cb;
 +		/* BKE: gpencil.c */
 +		extern void *BKE_gpencil_batch_cache_dirty_cb;
 +		extern void *BKE_gpencil_batch_cache_free_cb;
  
+ 		BKE_mball_batch_cache_dirty_cb = DRW_mball_batch_cache_dirty;
+ 		BKE_mball_batch_cache_free_cb = DRW_mball_batch_cache_free;
+ 
  		BKE_curve_batch_cache_dirty_cb = DRW_curve_batch_cache_dirty;
  		BKE_curve_batch_cache_free_cb = DRW_curve_batch_cache_free;
  
diff --cc source/blender/gpu/intern/gpu_shader.c
index 9fea8c3db86,598722d372b..93715b50ae5
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@@ -827,12 -821,8 +828,15 @@@ GPUShader *GPU_shader_get_builtin_shade
  		[GPU_SHADER_3D_INSTANCE_BONE_ENVELOPE_WIRE] = { datatoc_gpu_shader_instance_bone_envelope_wire_vert_glsl,
  		                                                datatoc_gpu_shader_flat_color_frag_glsl },
  
+ 		[GPU_SHADER_3D_INSTANCE_MBALL_HELPERS] = { datatoc_gpu_shader_instance_mball_helpers_vert_glsl,
+ 		                                           datatoc_gpu_shader_flat_color_frag_glsl },
++
 +		[GPU_SHADER_GPENCIL_STROKE] = { datatoc_gpu_shader_gpencil_stroke_vert_glsl,
 +									    datatoc_gpu_shader_gpencil_stroke_frag_glsl,
 +			                            datatoc_gpu_shader_gpencil_stroke_geom_glsl },
 +
 +		[GPU_SHADER_GPENCIL_FILL] = { datatoc_gpu_shader_gpencil_fill_vert_glsl,
 +		                              datatoc_gpu_shader_gpencil_fill_frag_glsl },
  	};
  
  	if (builtin_shaders[shader] == NULL) {