[Bf-blender-cvs] [fb439d5a87e] soc-2019-outliner: Merge branch 'master' into soc-2019-outliner

Nathan Craddock noreply at git.blender.org
Fri Jun 21 22:07:38 CEST 2019


Commit: fb439d5a87e594d8fc3f8cbfca119fbd2df58766
Author: Nathan Craddock
Date:   Fri Jun 21 14:01:18 2019 -0600
Branches: soc-2019-outliner
https://developer.blender.org/rBfb439d5a87e594d8fc3f8cbfca119fbd2df58766

Merge branch 'master' into soc-2019-outliner

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



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

diff --cc source/blender/editors/space_outliner/outliner_draw.c
index da498bc1fd4,a151061ae64..252a7061bc5
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@@ -31,7 -31,7 +31,8 @@@
  #include "DNA_object_types.h"
  #include "DNA_scene_types.h"
  #include "DNA_sequence_types.h"
 +#include "DNA_constraint_types.h"
+ #include "DNA_object_force_types.h"
  
  #include "BLI_math.h"
  #include "BLI_blenlib.h"



More information about the Bf-blender-cvs mailing list