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

[Antonio Vazquez]

Commit: 7dbdd96912ac4ced2d4e5801da27675c4ee453a5
Author: Antonio Vazquez
Date:   Mon Jun 11 15:51:02 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB7dbdd96912ac4ced2d4e5801da27675c4ee453a5

Merge branch 'blender2.8' into greasepencil-object

 Conflicts:
	source/blender/blenkernel/intern/object_update.c

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



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

diff --cc source/blender/blenkernel/intern/object_update.c
index 3196019f242,f0f31eebfbd..e593f0aa264
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@@ -57,11 -62,6 +62,7 @@@
  #include "BKE_particle.h"
  #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"
  
diff --cc source/blender/makesrna/intern/rna_scene.c
index 0870d05101a,af92f25d401..7f7525dda92
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -546,9 -538,111 +546,9 @@@ static void rna_GPencilInterpolateSetti
  	}
  }
  
 -/* Grease pencil Drawing Brushes */
 -static bGPDbrush *rna_GPencil_brush_new(ToolSettings *ts, const char *name, int setactive)
 -{
 -	bGPDbrush *brush = BKE_gpencil_brush_addnew(ts, name, setactive != 0);
 -
 -	WM_main_add_notifier(NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
 -
 -	return brush;
 -}
 -
 -static void rna_GPencil_brush_remove(ToolSettings *ts, ReportList *reports, PointerRNA *brush_ptr)
 -{
 -	bGPDbrush *brush = brush_ptr->data;
 -	if (BLI_findindex(&ts->gp_brushes, brush) == -1) {
 -		BKE_report(reports, RPT_ERROR, "Brush not found in grease pencil data");
 -		return;
 -	}
 -
 -	BKE_gpencil_brush_delete(ts, brush);
 -	RNA_POINTER_INVALIDATE(brush_ptr);
 -
 -	WM_main_add_notifier(NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
 -}
 -
 -static PointerRNA rna_GPencilBrushes_active_get(PointerRNA *ptr)
 -{
 -	ToolSettings *ts = (ToolSettings *) ptr->data;
 -
 -	bGPDbrush *brush;
 -
 -	for (brush = ts->gp_brushes.first; brush; brush = brush->next) {
 -		if (brush->flag & GP_BRUSH_ACTIVE) {
 -			break;
 -		}
 -	}
 -
 -	if (brush) {
 -		return rna_pointer_inherit_refine(ptr, &RNA_GPencilBrush, brush);
 -	}
 -
 -	return rna_pointer_inherit_refine(ptr, NULL, NULL);
 -}
 -
 -static void rna_GPencilBrushes_active_set(PointerRNA *ptr, PointerRNA value)
 -{
 -	ToolSettings *ts = (ToolSettings *) ptr->data;
 -
 -	bGPDbrush *brush;
 -
 -	for (brush = ts->gp_brushes.first; brush; brush = brush->next) {
 -		if (brush == value.data) {
 -			brush->flag |= GP_BRUSH_ACTIVE;
 -		}
 -		else {
 -			brush->flag &= ~GP_BRUSH_ACTIVE;
 -		}
 -	}
 -	WM_main_add_notifier(NC_GPENCIL | NA_EDITED, NULL);
 -}
 -
 -static int rna_GPencilBrushes_index_get(PointerRNA *ptr)
 -{
 -	ToolSettings *ts = (ToolSettings *) ptr->data;
 -	bGPDbrush *brush = BKE_gpencil_brush_getactive(ts);
 -
 -	return BLI_findindex(&ts->gp_brushes, brush);
 -}
 -
 -static void rna_GPencilBrushes_index_set(PointerRNA *ptr, int value)
 -{
 -	ToolSettings *ts = (ToolSettings *) ptr->data;
 -
 -	bGPDbrush *brush = BLI_findlink(&ts->gp_brushes, value);
 -
 -	BKE_gpencil_brush_setactive(ts, brush);
 -	WM_main_add_notifier(NC_GPENCIL | ND_DATA | NA_EDITED, NULL);
 -}
 -
 -static void rna_GPencilBrushes_index_range(PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax)
 -{
 -	ToolSettings *ts = (ToolSettings *) ptr->data;
 -
 -	*min = 0;
 -	*max = max_ii(0, BLI_listbase_count(&ts->gp_brushes) - 1);
 -
 -	*softmin = *min;
 -	*softmax = *max;
 -}
 -
 -static void rna_GPencilBrush_name_set(PointerRNA *ptr, const char *value)
 -{
 -	ToolSettings *ts = ((Scene *) ptr->id.data)->toolsettings;
 -	bGPDbrush *brush = ptr->data;
 -
 -	/* copy the new name into the name slot */
 -	BLI_strncpy_utf8(brush->info, value, sizeof(brush->info));
 -
 -	BLI_uniquename(&ts->gp_brushes, brush, DATA_("GP_Brush"), '.', offsetof(bGPDbrush, info), sizeof(brush->info));
 -}
 -
 -/* ----------------- end of Grease pencil drawing brushes ------------*/
 -
  static void rna_SpaceImageEditor_uv_sculpt_update(Main *bmain, Scene *scene, PointerRNA *UNUSED(ptr))
  {
- 	ED_space_image_uv_sculpt_update(bmain->wm.first, scene);
+ 	ED_space_image_uv_sculpt_update(bmain, bmain->wm.first, scene);
  }