Blender Git Loki

remove CDDM_copy second argument, added CDDM_copy_from_tessface instead.

this function caused too many conflicts and in most cases was zero anyway.

svn merge ^/trunk/blender -r43733:43751

fix [#30017] Make Dupli-Face needs active mesh object

Fixed for cloth modifier when it's applied after deformation modifier.

Merged changes in the trunk up to revision 43748.

Conflicts resolved:
source/blender/editors/include/UI_resources.h

Fix for [#30015] Keyframed Resolution Unpredictable
* Disabled possibility to keyframe render resolution, percentage and border render properties. Animating them does not makes much sense. Discussed with Sergey in IRC.

Release cycle:
* Moving on to BCon3: Beta.

Fixed typo in a tooltip

Dynamic Paint:
* Fix: Brush didn't paint particles that were hidden by the display percentage setting.

Always assume isFinalCals is truth when applying constructive modifiers on curves
for viewport display.

It saves plenty of memory when using subsurf modifier which result is getting
converted from CCGDM to CDDM without any benefit. It also syncs behavior of
modifiers with mesh.

Need to keep an eye on constructive modifiers when in edit mode.

Discovered this when was looking into #29973.

Cycles: another fix for CUDA render passes, needed to align float4 passes.

Fixed some possible issues and access non-initialized variable in Carve BOP interface.

Discovered when was investigating some crashes caused by Carve's triangulator.

Minor fix for CD_TYPE_AS_MASK macro: shift operator uses the left
operand's type for the result, so cast 1 to CustomDataMask.

Fix #30000: Boolean modifier messing up multi material

Issue was caused by resetting face's mat_nr to zero if there's no material
map sent to ConvertCSGDescriptorsToDerivedMesh. In case of boolean modifier
we can't use such map because we can't affect on materials present in object.

So the only way which can give reasonable result is:
- Dot change mat_nr for faces from left operand (they should be fine, because
materials aren't deleting by modifier)
- For faces from right operand check if needed material exists in left operand
and if so, use it's index as new mat_nr.
- If there are materials in right operand which doesn't exist in left operand,
they'll be changed to first material from left operand.

Fix [#29884] Splash screen only displays "r43"
Based on patch by perfection cat

Removed the unnecessary char * juggling.

Action Constraint GUI - Refinements and Clarification

While looking at a bug report, I found that the current GUI for the Action
Constraint actually didn't make sense, mixing up settings so that it wasn't
clear which settings corresponded to which others. This commit cleans up the
layout into a clearer two-column design to have a "from" -> "to" layout, making
all the
relationships between things clear.

For more details see http://aligorith.blogspot.com/2012/01/action-constraint-
gui-revised.html

Cycles: disable environment importance sampling code for CUDA cards with
compute model < 2.x, to avoid running out of memory in the compiler.

svn merge ^/trunk/blender -r43693:43733

Cycles: render passes for CUDA cards with compute model >= 2.x.

Fix orthogonality check for mat3 and mat4