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

Antonio Vazquez noreply at git.blender.org
Fri May 5 12:26:55 CEST 2017


Commit: 291f49b0b2dda840fc45e4523596ac4159abdb23
Author: Antonio Vazquez
Date:   Thu May 4 20:23:02 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB291f49b0b2dda840fc45e4523596ac4159abdb23

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/draw/CMakeLists.txt
index f727df15cc0,15c9da0d9b5..799fb1421fc
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -82,10 -82,8 +82,11 @@@ set(SR
  	engines/eevee/eevee_engine.c
  	engines/eevee/eevee_lights.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.c
  
  	DRW_engine.h
  	intern/DRW_render.h




More information about the Bf-blender-cvs mailing list