Merge branch 'soc-2014-viewport' into soc-2013-viewport_fx

Conflicts:
	intern/cycles/device/device_cuda.cpp
	intern/ghost/intern/GHOST_WindowCocoa.mm
	source/blender/blenfont/intern/blf_font.c
	source/blender/blenfont/intern/blf_translation.c
	source/blender/blenkernel/BKE_brush.h
	source/blender/blenkernel/BKE_pbvh.h
	source/blender/blenkernel/intern/cdderivedmesh.c
	source/blender/blenkernel/intern/editderivedmesh.c
	source/blender/blenkernel/intern/mesh.c
	source/blender/blenkernel/intern/subsurf_ccg.c
	source/blender/blenlib/BLI_fileops.h
	source/blender/blenlib/BLI_math_matrix.h
	source/blender/blenlib/intern/fileops.c
	source/blender/blenlib/intern/math_matrix.c
	source/blender/editors/animation/anim_channels_defines.c
	source/blender/editors/animation/anim_draw.c
	source/blender/editors/animation/keyframes_draw.c
	source/blender/editors/include/ED_armature.h
	source/blender/editors/interface/interface.c
	source/blender/editors/interface/interface_draw.c
	source/blender/editors/interface/interface_icons.c
	source/blender/editors/interface/interface_panel.c
	source/blender/editors/interface/interface_widgets.c
	source/blender/editors/interface/view2d.c
	source/blender/editors/mask/mask_draw.c
	source/blender/editors/mesh/editmesh_select.c
	source/blender/editors/render/render_opengl.c
	source/blender/editors/screen/area.c
	source/blender/editors/screen/glutil.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_utils.c
	source/blender/editors/sculpt_paint/sculpt_intern.h
	source/blender/editors/space_buttons/space_buttons.c
	source/blender/editors/space_clip/clip_dopesheet_draw.c
	source/blender/editors/space_clip/clip_draw.c
	source/blender/editors/space_clip/clip_graph_draw.c
	source/blender/editors/space_clip/clip_utils.c
	source/blender/editors/space_console/console_draw.c
	source/blender/editors/space_file/file_draw.c
	source/blender/editors/space_file/file_ops.c
	source/blender/editors/space_graph/graph_draw.c
	source/blender/editors/space_info/info_draw.c
	source/blender/editors/space_info/textview.c
	source/blender/editors/space_logic/logic_window.c
	source/blender/editors/space_nla/nla_draw.c
	source/blender/editors/space_outliner/outliner_draw.c
	source/blender/editors/space_sequencer/sequencer_draw.c
	source/blender/editors/space_view3d/drawanimviz.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/view3d_draw.c
	source/blender/editors/space_view3d/view3d_fly.c
	source/blender/editors/space_view3d/view3d_intern.h
	source/blender/editors/space_view3d/view3d_walk.c
	source/blender/editors/transform/transform.c
	source/blender/editors/transform/transform_manipulator.c
	source/blender/editors/util/ed_util.c
	source/blender/editors/uvedit/uvedit_draw.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_codegen.h
	source/blender/gpu/intern/gpu_draw.c
	source/blender/render/intern/source/convertblender.c
	source/blender/windowmanager/intern/wm_operators.c
	source/blender/windowmanager/intern/wm_subwindow.c
	source/blender/windowmanager/intern/wm_window.c

1 files changed, 5 insertions, 1 deletions

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index ab891a244fa..28faa4f5327 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -78,7 +78,8 @@ set(SRC
 	intern/colortools.c
 	intern/constraint.c
 	intern/context.c
-	intern/curve.c
+        intern/crazyspace.c
+        intern/curve.c
 	intern/customdata.c
 	intern/customdata_file.c
 	intern/deform.c
@@ -107,6 +108,7 @@ set(SRC
 	intern/lamp.c
 	intern/lattice.c
 	intern/library.c
+	intern/library_query.c
 	intern/linestyle.c
 	intern/mask.c
 	intern/mask_evaluate.c
@@ -190,6 +192,7 @@ set(SRC
 	BKE_colortools.h
 	BKE_constraint.h
 	BKE_context.h
+        BKE_crazyspace.h
 	BKE_curve.h
 	BKE_customdata.h
 	BKE_customdata_file.h
@@ -214,6 +217,7 @@ set(SRC
 	BKE_lamp.h
 	BKE_lattice.h
 	BKE_library.h
+	BKE_library_query.h
 	BKE_linestyle.h
 	BKE_main.h
 	BKE_mask.h