Merge branch 'master' into soc-2013-viewport_fx

Conflicts:
	CMakeLists.txt
	intern/cycles/app/CMakeLists.txt
	intern/ghost/CMakeLists.txt
	intern/ghost/intern/GHOST_Window.h
	intern/ghost/intern/GHOST_WindowWin32.cpp
	intern/ghost/intern/GHOST_WindowWin32.h
	release/datafiles/startup.blend
	source/blender/blenfont/BLF_api.h
	source/blender/blenfont/intern/blf_font.c
	source/blender/blenfont/intern/blf_glyph.c
	source/blender/blenfont/intern/blf_lang.c
	source/blender/blenkernel/intern/anim.c
	source/blender/blenkernel/intern/cdderivedmesh.c
	source/blender/blenkernel/intern/displist.c
	source/blender/blenkernel/intern/editderivedmesh.c
	source/blender/blenkernel/intern/mball.c
	source/blender/blenkernel/intern/mesh.c
	source/blender/blenkernel/intern/pbvh.c
	source/blender/blenkernel/intern/subsurf_ccg.c
	source/blender/blenlib/BLI_math_base.h
	source/blender/blenlib/BLI_math_matrix.h
	source/blender/blenlib/BLI_smallhash.h
	source/blender/blenlib/intern/math_matrix.c
	source/blender/blenlib/intern/math_vector_inline.c
	source/blender/blenlib/intern/storage.c
	source/blender/blenloader/BLO_readfile.h
	source/blender/datatoc/CMakeLists.txt
	source/blender/editors/animation/keyframes_draw.c
	source/blender/editors/armature/CMakeLists.txt
	source/blender/editors/armature/editarmature_sketch.c
	source/blender/editors/gpencil/drawgpencil.c
	source/blender/editors/include/BIF_gl.h
	source/blender/editors/include/BIF_glutil.h
	source/blender/editors/include/UI_interface.h
	source/blender/editors/interface/interface_draw.c
	source/blender/editors/interface/interface_ops.c
	source/blender/editors/interface/interface_panel.c
	source/blender/editors/interface/interface_widgets.c
	source/blender/editors/mask/mask_draw.c
	source/blender/editors/mesh/editmesh_knife.c
	source/blender/editors/mesh/editmesh_select.c
	source/blender/editors/screen/glutil.c
	source/blender/editors/screen/screen_edit.c
	source/blender/editors/screen/screendump.c
	source/blender/editors/sculpt_paint/paint_cursor.c
	source/blender/editors/sculpt_paint/paint_image.c
	source/blender/editors/sculpt_paint/paint_image_proj.c
	source/blender/editors/sculpt_paint/paint_intern.h
	source/blender/editors/sculpt_paint/sculpt_intern.h
	source/blender/editors/space_action/action_draw.c
	source/blender/editors/space_action/space_action.c
	source/blender/editors/space_clip/clip_dopesheet_draw.c
	source/blender/editors/space_clip/clip_draw.c
	source/blender/editors/space_file/file_intern.h
	source/blender/editors/space_graph/graph_draw.c
	source/blender/editors/space_image/image_draw.c
	source/blender/editors/space_info/textview.c
	source/blender/editors/space_nla/nla_draw.c
	source/blender/editors/space_node/drawnode.c
	source/blender/editors/space_node/node_draw.c
	source/blender/editors/space_outliner/outliner_draw.c
	source/blender/editors/space_sequencer/sequencer_draw.c
	source/blender/editors/space_text/text_draw.c
	source/blender/editors/space_view3d/drawarmature.c
	source/blender/editors/space_view3d/drawmesh.c
	source/blender/editors/space_view3d/drawobject.c
	source/blender/editors/space_view3d/drawvolume.c
	source/blender/editors/space_view3d/view3d_draw.c
	source/blender/editors/space_view3d/view3d_edit.c
	source/blender/editors/space_view3d/view3d_fly.c
	source/blender/editors/space_view3d/view3d_intern.h
	source/blender/editors/transform/transform.c
	source/blender/editors/transform/transform.h
	source/blender/editors/transform/transform_constraints.c
	source/blender/editors/transform/transform_manipulator.c
	source/blender/editors/util/ed_util.c
	source/blender/editors/uvedit/CMakeLists.txt
	source/blender/editors/uvedit/uvedit_draw.c
	source/blender/editors/uvedit/uvedit_smart_stitch.c
	source/blender/gpu/GPU_buffers.h
	source/blender/gpu/intern/gpu_buffers.c
	source/blender/gpu/intern/gpu_codegen.c
	source/blender/gpu/intern/gpu_draw.c
	source/blender/gpu/intern/gpu_extensions.c
	source/blender/gpu/intern/gpu_simple_shader.c
	source/blender/gpu/shaders/gpu_shader_material.glsl
	source/blender/render/intern/source/voxeldata.c
	source/blender/windowmanager/intern/wm_dragdrop.c
	source/blender/windowmanager/intern/wm_draw.c
	source/blender/windowmanager/intern/wm_event_system.c
	source/blender/windowmanager/intern/wm_gesture.c
	source/blender/windowmanager/intern/wm_subwindow.c
	source/blender/windowmanager/intern/wm_window.c

1 files changed, 16 insertions, 10 deletions

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 88034257aec..ab891a244fa 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -41,10 +41,10 @@ set(INC
 	../../../intern/iksolver/extern
 	../../../intern/memutil
 	../../../intern/mikktspace
-	../../../intern/opennl/extern
 	../../../intern/raskter
 	../../../intern/smoke/extern
 	../../../extern/libmv
+	../../../intern/atomic
 
 	# XXX - BAD LEVEL CALL WM_api.h
 	../windowmanager
@@ -63,6 +63,7 @@ set(SRC
 	intern/anim.c
 	intern/anim_sys.c
 	intern/armature.c
+	intern/autoexec.c
 	intern/blender.c
 	intern/bmfont.c
 	intern/boids.c
@@ -113,6 +114,8 @@ set(SRC
 	intern/material.c
 	intern/mball.c
 	intern/mesh.c
+	intern/mesh_evaluate.c
+	intern/mesh_mapping.c
 	intern/mesh_validate.c
 	intern/modifier.c
 	intern/modifiers_bmesh.c
@@ -122,6 +125,7 @@ set(SRC
 	intern/node.c
 	intern/object.c
 	intern/object_deform.c
+	intern/object_dupli.c
 	intern/ocean.c
 	intern/packedFile.c
 	intern/paint.c
@@ -136,7 +140,6 @@ set(SRC
 	intern/sca.c
 	intern/scene.c
 	intern/screen.c
-	intern/script.c
 	intern/seqcache.c
 	intern/seqeffects.c
 	intern/seqmodifier.c
@@ -152,6 +155,13 @@ set(SRC
 	intern/text.c
 	intern/texture.c
 	intern/tracking.c
+	intern/tracking_detect.c
+	intern/tracking_plane_tracker.c
+	intern/tracking_region_tracker.c
+	intern/tracking_solver.c
+	intern/tracking_stabilize.c
+	intern/tracking_util.c
+	intern/treehash.c
 	intern/unit.c
 	intern/world.c
 	intern/writeavi.c
@@ -163,8 +173,8 @@ set(SRC
 	BKE_anim.h
 	BKE_animsys.h
 	BKE_armature.h
+	BKE_autoexec.h
 	BKE_blender.h
-	BKE_bmesh.h
 	BKE_bmfont.h
 	BKE_bmfont_types.h
 	BKE_boids.h
@@ -210,6 +220,7 @@ set(SRC
 	BKE_material.h
 	BKE_mball.h
 	BKE_mesh.h
+	BKE_mesh_mapping.h
 	BKE_modifier.h
 	BKE_movieclip.h
 	BKE_multires.h
@@ -229,7 +240,6 @@ set(SRC
 	BKE_sca.h
 	BKE_scene.h
 	BKE_screen.h
-	BKE_script.h
 	BKE_sequencer.h
 	BKE_shrinkwrap.h
 	BKE_sketch.h
@@ -244,6 +254,7 @@ set(SRC
 	BKE_text.h
 	BKE_texture.h
 	BKE_tracking.h
+	BKE_treehash.h
 	BKE_unit.h
 	BKE_utildefines.h
 	BKE_world.h
@@ -252,6 +263,7 @@ set(SRC
 
 	depsgraph_private.h
 	nla_private.h
+	tracking_private.h
 	intern/CCGSubSurf.h
 	intern/pbvh_intern.h
 )
@@ -372,12 +384,6 @@ if(WITH_MOD_OCEANSIM)
 	add_definitions(-DWITH_OCEANSIM)
 endif()
 
-if(WITH_MOD_BOOLEAN)
-	list(APPEND INC
-		../../../intern/bsp/extern
-	)
-endif()
-
 if(WITH_JACK)
 	add_definitions(-DWITH_JACK)
 endif()