Blender Git Loki

Merge branch 'master' into soc-2013-depsgraph_mt

Conflicts:
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/shrinkwrap.c
source/blender/collada/AnimationExporter.cpp
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_util.c
source/blender/render/intern/source/pipeline.c

Merge branch 'master' into soc-2013-depsgraph_mt

Fix compilation error when using scons

Rename evaluation_context to eval_ctx

Only affects on variable name, structure name stays the same.
Addresses code review from Campbell to make variable names
which are being passed all over be short.

Not entirely happy with this, but well ok. It's still verbose
enough and naming kind of consistent to what Python uses.

Discussed with Brecht and he's also fine with such a change.

Hopefully this is last change to be done before merge :)

Merge branch 'master' into soc-2013-depsgraph_mt

Conflicts:
source/blender/editors/render/render_internal.c
source/blender/modifiers/intern/MOD_smoke.c

Address notes from Campbell's review

- Cleanup naming in some places.
- Get rid of _ex functions with use_threads argument
in scene update routines.

Using Py_BEGIN_ALLOW_THREADS from frame_set and
update_tagged functions seems made the trick.

- Fix for possible uninitialized members of
evaluation context when it's allocated in stack.

Merge branch 'master' into soc-2013-depsgraph_mt

Address review from Brecht

* Removed residual of derivedRender code from convertblender.c
* Added check for oldcreen->scene != screen->scene before rebuilding
the DAG when changing the scene.
* Made blender compilable with smoke disabled.
* Typo fixes.

Merge branch 'master' into soc-2013-depsgraph_mt

Conflicts:
release/scripts/startup/bl_ui/properties_data_curve.py

Fix typo which was already fixed in trunk actually

Code cleanup to address Lukas codereview comments

Workaround for render settings with mballs and cycles

Not ideal solution, but it'll work just fine for until
CoW is implemented (which is gonna to take a while anyway).

Pass evaluation context to BKE_scene_base_iter_next

This is needed to make dupilist being created with
proper render settings when counting mballs.

Without this change enabling particles for rendering
and disabling them for viewport would lead to situation
when mball used as dupliobject for this particle system
is never visible.

Also removed hardcoded evaluation context from some
RNA callbacks.

TODO: Cycles will use viewport render settings for
mballs, don't ask why. It is to be solved.

Temporary remove derivedRender

Couldn't say the idea was wrong, but some nasty bugs were
discovered with the approach and to make life simpler for
now it's easier to do hacks needed for boolean modifier
from the render pipeline by tagging needed operands for
the update.

Update metaballs in a single thread

Mballs evaluation uses BKE_scene_base_iter_next which calls
duplilist for all objects in the scene. This leads to conflict
accessing and writing same data from multiple threads.

Ideally Mballs shouldn't do such an iteration and use DAG
queries instead. For the time being we've got new DAG
let's keep it simple and update mballs in a ingle thread.

Code cleanup

- Add some additional cases to mallocn_intern
to cover FreeBSD and add missing include for OSX.

- Move DAG_init/DAG_exit functions to the top,
they're kind of global and it's not so much
logical to keep them under "Threaded Update"
comment.

Merge branch 'master' into soc-2013-depsgraph_mt

Fixes for stupid mistakes from a while ago

- Render engine's evaluation context didn't set for_render to truth.
- Use G.evaluation_context for motion path instead of local one.

Address some of the codereview comments

- Call it just DAG_init/DAG_exit
- Move EvaluationContext to a better place (DAG header).
- Rename valency to num_pending_parents.
- Added a comment about why we might want to not
use threads for the scene update/
- Update comment for screen switch.

Post-merge compilation error fix

Was caused by the new code in master since previous merge
by the looks of it.