[Bf-blender-cvs] [16d0229] soc-2013-paint: Merge branch 'master' into soc-2013-paint

[Antony Riakiotakis]

Commit: 16d02292ed1044d1da4201fad1d779a51dde7ed0
Author: Antony Riakiotakis
Date:   Thu May 1 03:23:20 2014 +0300
https://developer.blender.org/rB16d02292ed1044d1da4201fad1d779a51dde7ed0

Merge branch 'master' into soc-2013-paint

Conflicts:
	source/blender/editors/sculpt_paint/paint_image.c
	source/blender/editors/sculpt_paint/paint_image_2d.c
	source/blender/editors/sculpt_paint/paint_image_proj.c

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



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

diff --cc source/blender/editors/sculpt_paint/paint_image.c
index ec036b8,5e2bdcb..3b8bc4c
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@@ -42,10 -42,7 +42,8 @@@
  
  #include "BLI_math.h"
  #include "BLI_blenlib.h"
- #include "BLI_linklist.h"
- #include "BLI_memarena.h"
- #include "BLI_threads.h"
  #include "BLI_utildefines.h"
++#include "BLI_threads.h"
  
  #include "PIL_time.h"
  
@@@ -57,33 -54,20 +55,26 @@@
  #include "DNA_node_types.h"
  #include "DNA_object_types.h"
  
- #include "BKE_camera.h"
  #include "BKE_context.h"
  #include "BKE_depsgraph.h"
- #include "BKE_DerivedMesh.h"
- #include "BKE_idprop.h"
  #include "BKE_brush.h"
  #include "BKE_image.h"
- #include "BKE_library.h"
  #include "BKE_main.h"
 +#include "BKE_material.h"
  #include "BKE_mesh.h"
  #include "BKE_node.h"
- #include "BKE_object.h"
  #include "BKE_paint.h"
 +#include "BKE_report.h"
 +#include "BKE_scene.h"
 +#include "BKE_texture.h"
 +#include "BKE_colortools.h"
  
  #include "BKE_editmesh.h"
  
  #include "UI_view2d.h"
  
  #include "ED_image.h"
++#include "ED_mesh.h"
  #include "ED_object.h"
  #include "ED_screen.h"
  #include "ED_sculpt.h"
@@@ -100,6 -82,6 +89,9 @@@
  
  #include "GPU_draw.h"
  
++#include "BIF_gl.h"
++#include "BIF_glutil.h"
++
  #include "IMB_colormanagement.h"
  
  #include "paint_intern.h"
@@@ -1243,9 -894,10 +1235,10 @@@ static int sample_color_invoke(bContex
  	WM_redraw_windows(C);
  
  	RNA_int_set_array(op->ptr, "location", event->mval);
 -	paint_sample_color(C, ar, event->mval[0], event->mval[1]);
++
 +	paint_sample_color(C, ar, event->mval[0], event->mval[1], mode == PAINT_TEXTURE_PROJECTIVE, false);
- 	WM_cursor_modal_set(CTX_wm_window(C), BC_EYEDROPPER_CURSOR);
+ 	WM_cursor_modal_set(win, BC_EYEDROPPER_CURSOR);
  
 -	WM_event_add_modal_handler(C, op);
  	WM_event_add_notifier(C, NC_BRUSH | NA_EDITED, brush);
  
  	return OPERATOR_RUNNING_MODAL;
diff --cc source/blender/editors/sculpt_paint/paint_image_2d.c
index ee0956a,7888b15..26bf489
--- a/source/blender/editors/sculpt_paint/paint_image_2d.c
+++ b/source/blender/editors/sculpt_paint/paint_image_2d.c
@@@ -39,15 -39,9 +39,15 @@@
  #include "DNA_object_types.h"
  
  #include "BLI_math.h"
+ 
 +#include "BLI_rect.h"
 +#include "BLI_math_color_blend.h"
 +#include "BLI_gsqueue.h"
 +#include "BLI_bitmap.h"
 +
  #include "BKE_context.h"
 +#include "BKE_depsgraph.h"
  #include "BKE_brush.h"
- #include "BKE_main.h"
  #include "BKE_image.h"
  #include "BKE_paint.h"
  #include "BKE_report.h"
diff --cc source/blender/editors/sculpt_paint/paint_image_proj.c
index 7b96692,8db21c9..da31331
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@@ -56,39 -54,25 +56,32 @@@
  #include "IMB_imbuf_types.h"
  
  #include "DNA_brush_types.h"
++#include "DNA_material_types.h"
  #include "DNA_mesh_types.h"
  #include "DNA_node_types.h"
  #include "DNA_object_types.h"
  
++#include "BKE_brush.h"
  #include "BKE_camera.h"
 +#include "BKE_colortools.h"
  #include "BKE_context.h"
 +#include "BKE_depsgraph.h"
  #include "BKE_DerivedMesh.h"
  #include "BKE_idprop.h"
--#include "BKE_brush.h"
  #include "BKE_image.h"
  #include "BKE_library.h"
  #include "BKE_main.h"
 +#include "BKE_material.h"
 +#include "BKE_mesh.h"
  #include "BKE_mesh_mapping.h"
- #include "BKE_node.h"
- #include "BKE_object.h"
  #include "BKE_paint.h"
  #include "BKE_report.h"
  #include "BKE_scene.h"
 +#include "BKE_texture.h"
  
- #include "BKE_editmesh.h"
- 
- #include "BIF_gl.h"
- #include "BIF_glutil.h"
- 
  #include "UI_view2d.h"
 +#include "UI_interface.h"
  
- #include "ED_image.h"
  #include "ED_screen.h"
  #include "ED_sculpt.h"
  #include "ED_uvedit.h"
diff --cc source/blender/editors/transform/transform_generics.c
index bed60b7,632d6c0..63b7d36
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@@ -69,15 -67,12 +68,13 @@@
  #include "BKE_animsys.h"
  #include "BKE_action.h"
  #include "BKE_armature.h"
 +#include "BKE_context.h"
  #include "BKE_curve.h"
  #include "BKE_depsgraph.h"
- #include "BKE_displist.h"
  #include "BKE_fcurve.h"
  #include "BKE_lattice.h"
- #include "BKE_mesh.h"
  #include "BKE_nla.h"
 -#include "BKE_context.h"
 +#include "BKE_paint.h"
  #include "BKE_sequencer.h"
  #include "BKE_editmesh.h"
  #include "BKE_tracking.h"
diff --cc source/blender/gpu/intern/gpu_buffers.c
index f2b6746,9bf63d2..f2eae52
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@@ -46,8 -46,7 +46,8 @@@
  #include "BLI_ghash.h"
  #include "BLI_threads.h"
  
- #include "DNA_meshdata_types.h"
 +#include "DNA_material_types.h"
+ #include "DNA_meshdata_types.h"
  
  #include "BKE_ccg.h"
  #include "BKE_DerivedMesh.h"