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

Antonio Vazquez noreply at git.blender.org
Thu Jul 5 09:49:33 CEST 2018


Commit: 41418be00dfaed5143a9e69a699905057ef58821
Author: Antonio Vazquez
Date:   Thu Jul 5 09:49:23 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB41418be00dfaed5143a9e69a699905057ef58821

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/blenloader/intern/writefile.c
index ebba97a214f,0a2d09d0c86..67a16ee0225
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@@ -166,8 -165,8 +166,9 @@@
  #include "BKE_collection.h"
  #include "BKE_constraint.h"
  #include "BKE_global.h" // for G
 +#include "BKE_gpencil_modifier.h"
  #include "BKE_idcode.h"
+ #include "BKE_layer.h"
  #include "BKE_library.h" // for  set_listbasepointers
  #include "BKE_library_override.h"
  #include "BKE_main.h"
diff --cc source/blender/editors/space_buttons/buttons_context.c
index 7d063a58e43,4ad62ec705d..4b987cfc954
--- a/source/blender/editors/space_buttons/buttons_context.c
+++ b/source/blender/editors/space_buttons/buttons_context.c
@@@ -472,11 -477,11 +477,12 @@@ static int buttons_context_path(const b
  {
  	SpaceButs *sbuts = CTX_wm_space_buts(C);
  	Scene *scene = CTX_data_scene(C);
+ 	ViewLayer *view_layer = CTX_data_view_layer(C);
+ 	wmWindow *window = CTX_wm_window(C);
  	WorkSpace *workspace = CTX_wm_workspace(C);
- 	ViewLayer *view_layer = BKE_view_layer_from_workspace_get(scene, workspace);
  	ID *id;
  	int found;
 +	Object *ob = CTX_data_active_object(C);
  
  	memset(path, 0, sizeof(*path));
  	path->flag = flag;



More information about the Bf-blender-cvs mailing list