Blender Git Commits

cleanup, using r_ for return parameters

Properly lock the priority queue mutex when scheduling operations.

Added a settings struct for depsgraph statistics/logging/debug to user
preferences.

Currently only has a generic "statistics" option, will be extended later.

Merge remote-tracking branch 'upstream/master' into multiview

Conflicts:
source/blender/blenloader/intern/versioning_270.c

Image Editor fixup, now ImageUser is always initialized properly, stereo
image loads right away and render images also display correctly

Automatically rebuild the new depsgraph in Scene alongside the old one.

This may later get deprecated, e.g. by moving depsgraph outside of Scene,
but for now this is easiest to use.

Run a depsgraph evaluation of the new depsgraph alongside the current scene updates.

This will allow more immediate testing of the scheduler.

Added threading system to evaluate the depsgraph nodes as managed by the scheduler.

This follows the same principles as the TaskScheduler/TaskPool systems in cycles
and the existing depsgraph, but uses a more flexible priority loop instead of the
simple low/high priority there.

Calculate the number of pending parents (input nodes that need updates) before the depsgraph evaluation.

Depsgraph: Yet another scons build fix (for modifiers module this time)

Depsgraph: Fix for building depsgraph module under SCons (part 2)

The build was failing on SCons + mingw64 since some defines were needed to
get around some C++ "standard library" crap which isn't at all standardly
(or at least not in the same namespace) available yet. Copied over some existing
code for dealing with this from the Ceres stuff (extern/libmv/third_party/ceres/SConscript)
so that this works.

Depsgraph: Fixed SCons buildsystem

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

Basic Scheduler class for the depsgraph.

Merge branch 'master' into soc-2013-paint

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

Add topology check to polyfill

Fix debug build compilation on linux

Merge branch 'master' into soc-2013-paint

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/makesrna/intern/rna_brush.c
source/blender/makesrna/intern/rna_internal.h

First steps toward scheduling: calculate priorities for all nodes
based on their dependants.

This heuristic can be improved later for more optimized scheduling.
The basic idea is to push all nodes which are evaluatable (all
dependencies satisfied) onto the queue, then pop the highest
priority node for evaluation.

Move libclew from intern to extern
step 1 of sharing it between compositor, cycles and opensubdiv