7 years agoFurther fix for #36382: bake buttons for linked objects could be grayed out
Brecht Van Lommel [Mon, 23 Sep 2013 12:14:06 +0000 (12:14 +0000)]
Further fix for #36382: bake buttons for linked objects could be grayed out
when they shouldn't be.

7 years agoMinor cleanup for own commit, removed unused line.
Lukas Toenne [Mon, 23 Sep 2013 08:57:46 +0000 (08:57 +0000)]
Minor cleanup for own commit, removed unused line.

7 years agoFix #36790, OSL point parameters of shader nodes not initialized correctly from UI...
Lukas Toenne [Mon, 23 Sep 2013 08:57:02 +0000 (08:57 +0000)]
Fix #36790, OSL point parameters of shader nodes not initialized correctly from UI inputs.
normal and point parameter types of OSL shaders are creating SOCK_VECTOR sockets in the script node. When these sockets are in turn used to define the fixed input values for these parameters they get
converted as OSL vector always, losing the distinction of vector/normal/point. To prevent OSL rejecting the value due to type mismatch, explicitly define the parameter defaults in the OSL script node
compiler function as vector, normal and point (unused types will simply be ignored).

7 years agoFix #36797 make linked node groups local does not work. Node tree library functions...
Lukas Toenne [Mon, 23 Sep 2013 08:20:16 +0000 (08:20 +0000)]
Fix #36797 make linked node groups local does not work. Node tree library functions where missing the ntreeMakeLocal entry, was still marked as 'not implemented'.

7 years agoFix potential usage of wrong track when setting axis for scene orientation
Sergey Sharybin [Mon, 23 Sep 2013 08:04:55 +0000 (08:04 +0000)]
Fix potential usage of wrong track when setting axis for scene orientation

8 years agoFix [#36791]: Fire ignores force fields when smoke is set to 0.0
Miika Hamalainen [Sun, 22 Sep 2013 16:09:31 +0000 (16:09 +0000)]
Fix [#36791]: Fire ignores force fields when smoke is set to 0.0

8 years agostyle cleanup: whitespace & odd indentation
Campbell Barton [Sat, 21 Sep 2013 10:46:58 +0000 (10:46 +0000)]
style cleanup: whitespace & odd indentation

8 years agoFix [#36788] changing the built in keying set prints "attempt to free NULL pointer...
Bastien Montagne [Sat, 21 Sep 2013 07:37:11 +0000 (07:37 +0000)]
Fix [#36788] changing the built in keying set prints "attempt to free NULL pointer" to console.

8 years agobugfix: [#36786] customdata layers are not merging taken the names into consideration
Dalai Felinto [Sat, 21 Sep 2013 05:42:34 +0000 (05:42 +0000)]
bugfix: [#36786] customdata layers are not merging taken the names into consideration
(which is also "[#36749] Joining objects with more than one uv map depends on list order")

Thanks Bastien Montagne and Brecht van Lommel for reviewing and some advice.

8 years agoOSX/scons: fix linking errors due bf_intern_ghostndof3dconnexion was build even if...
Jens Verwiebe [Fri, 20 Sep 2013 18:52:39 +0000 (18:52 +0000)]
OSX/scons: fix linking errors due bf_intern_ghostndof3dconnexion was build even if no 3Dmouseware was detected

8 years agoText Editor: 'Find' (in the Edit menu) was pointing to the wrong operator
Dalai Felinto [Fri, 20 Sep 2013 18:47:12 +0000 (18:47 +0000)]
Text Editor: 'Find' (in the Edit menu) was pointing to the wrong operator

8 years agobugfix [#36724] Ctrl+F in text editor opens Toolbar, but no longer closes it
Dalai Felinto [Fri, 20 Sep 2013 18:36:49 +0000 (18:36 +0000)]
bugfix [#36724] Ctrl+F in text editor opens Toolbar, but no longer closes it

(added Ctrl+P as a toggle to show Properties)

8 years agoMark Mesh->tface as DNA_DEPRECATED
Sergey Sharybin [Fri, 20 Sep 2013 13:22:45 +0000 (13:22 +0000)]
Mark Mesh->tface as DNA_DEPRECATED

It already had deprecated comment, but now it also uses
compiler flag just to be sure no one uses this guy.

8 years agoLet vertex bevel work on boundary verts of polys.
Howard Trickey [Fri, 20 Sep 2013 12:50:34 +0000 (12:50 +0000)]
Let vertex bevel work on boundary verts of polys.
Suggestion by Jonathan Williamson, and thanks to
Walid Shouman for noticing that the existing code
worked if a test to prohibit it were removed.

Limitation: treats segments > 1 the same as
segments == 1 in this case; a TODO to do
something more intelligent.

8 years agoFIX: [#27536] GLSL object space normal maps have wrong shading
Andrea Weikert [Fri, 20 Sep 2013 11:55:43 +0000 (11:55 +0000)]
FIX: [#27536] GLSL object space normal maps have wrong shading

Added object and world space for normal map in GLSL view.

8 years agoFix [#36759] UV Project - Specified UV Map doesnt work properly
Bastien Montagne [Fri, 20 Sep 2013 11:14:08 +0000 (11:14 +0000)]
Fix [#36759] UV Project - Specified UV Map doesnt work properly

In fact, the issue was that names of mloopuv/mtespoly layers could very easily get out of sync (a simple rename was enough), while most tools (such as the UVProject modifier) expect matching layers to have the same name!

Now matching names are check on load, and renaming of a layer through RNA is guaranted to be synchronized with its counterparts.

Thanks to Brecht & Campbell for reviews.

8 years agoImages didn't get clear when using multires baker from python script
Sergey Sharybin [Fri, 20 Sep 2013 10:14:58 +0000 (10:14 +0000)]
Images didn't get clear when using multires baker from python script

Seems to be a regression since BMesh merge.

8 years agoClear color to gray when baking displacement map
Sergey Sharybin [Fri, 20 Sep 2013 10:14:54 +0000 (10:14 +0000)]
Clear color to gray when baking displacement map

This makes more sense to have no displacement if baking
non-normalized displacement map or have mid-level displacement
(which is likely be close to no displacement as well) when
baking normalized displacement.

In any way it's better than using default black color.

8 years agoFix for margin which didn't work properly with normalized displacement baking
Sergey Sharybin [Fri, 20 Sep 2013 09:28:58 +0000 (09:28 +0000)]
Fix for margin which didn't work properly with normalized displacement baking

8 years agoFix for displacement bake buffer might be allocated twice
Sergey Sharybin [Fri, 20 Sep 2013 09:28:52 +0000 (09:28 +0000)]
Fix for displacement bake buffer might be allocated twice

Issue was caused by missing NULL-pointer check in user-data

This issue might have lead to wrong displacement map being

8 years agoFix #36226, Select Linked works not in touch with Prefs.
Lukas Toenne [Fri, 20 Sep 2013 09:10:17 +0000 (09:10 +0000)]
Fix #36226, Select Linked works not in touch with Prefs.
When setting keymap properties to values equalling the RNA default, they will
get "unset" and automatic operator behavior is used. There is no way to
explicitly set the default value as a user.

1) To allow distinguishing uninitialized (not set) properties in the keymap
items, a few changes to the RNA struct comparison function are needed: Instead
of allowing only strict/non-strict comparison of 2 properties A and B in a
struct, this now has 3 modes:
* STRICT: compare only the actual property values (same as 'strict' before)
* UNSET_MATCH_ANY: if either A or B is unset, consider them a match (same as
non-strict before)
* UNSET_MATCH_NONE: if one property is set and the other not, consider them a

The new UNSET_MATCH_NONE mode is useful for keymaps, because it allows keeping
user-defined property values in the keymap even if they match the default
property value (see wm_keymap_diff function in wm_keymap.c)

2) A new operator is added for unsetting ID properties in the RMB context menu
and in user preferences next to keymap properties. This only works on ID
properties and deletes the ID property storage, so that the default value is used.

In the user preferences for keymaps the properties are shown in an inactive
layout to indicate that the default value is used (which some operators such as
the "select linked" op from the report use to trigger automatic behavior). When
the user sets a property it gets set and stays that way until explicitly "unset"
using the new operator.

8 years agocode cleanup: quiet rna warnings, remove remove_strict_flags() for cmake/rna.
Campbell Barton [Fri, 20 Sep 2013 06:35:28 +0000 (06:35 +0000)]
code cleanup: quiet rna warnings, remove remove_strict_flags() for cmake/rna.

also set_source_files_properties() wasn't working for rna_*_gen.c files,
set dna.c and generated data files with generated property too.

8 years agofix for nla-strip-path function not returning an allocated pointer and new mask funct...
Campbell Barton [Fri, 20 Sep 2013 06:23:09 +0000 (06:23 +0000)]
fix for nla-strip-path function not returning an allocated pointer and new mask function ignoring the name argument from RNA-api.

8 years agoremove unused modifier argument from ParticleSystem.co_hair
Campbell Barton [Fri, 20 Sep 2013 06:20:07 +0000 (06:20 +0000)]
remove unused modifier argument from ParticleSystem.co_hair

8 years agofix [#36777] uv_on_emmiter make Blender crash
Campbell Barton [Fri, 20 Sep 2013 05:30:37 +0000 (05:30 +0000)]
fix [#36777] uv_on_emmiter make Blender crash

8 years agoreplace VIEW3D_OP_OFS_LOCK_TEST() macro with static function view3d_operator_offset_l...
Campbell Barton [Fri, 20 Sep 2013 01:43:06 +0000 (01:43 +0000)]
replace VIEW3D_OP_OFS_LOCK_TEST() macro with static function view3d_operator_offset_lock_check()

8 years agofix [#36773] Dolly breaks in quad view
Campbell Barton [Fri, 20 Sep 2013 01:24:00 +0000 (01:24 +0000)]
fix [#36773] Dolly breaks in quad view

more of a usability issue then a bug, now dolly switches out of camera view, like view-rotate does.

8 years agoRelease cycle / 2.69:
Thomas Dinges [Fri, 20 Sep 2013 00:48:03 +0000 (00:48 +0000)]
Release cycle / 2.69:
* Update links to release logs, now pointing at
* Update readme, also remove FreeBSD from it, we don't have official releases for that anymore.

8 years ago* Style cleanup / Cycles.
Thomas Dinges [Thu, 19 Sep 2013 23:54:16 +0000 (23:54 +0000)]
* Style cleanup / Cycles.

8 years agocorrect include guards and add checks in for them.
Campbell Barton [Thu, 19 Sep 2013 23:17:52 +0000 (23:17 +0000)]
correct include guards and add checks in for them.

8 years agoEnsure positions can be read for sources that have stride
Nathan Letwory [Thu, 19 Sep 2013 21:59:22 +0000 (21:59 +0000)]
Ensure positions can be read for sources that have stride
defined as 2 (2D coordinates).

8 years agoFix own stupid error in previous commit... :/
Bastien Montagne [Thu, 19 Sep 2013 20:27:26 +0000 (20:27 +0000)]
Fix own stupid error in previous commit... :/

8 years agoPrevent assert failure in knife.
Howard Trickey [Thu, 19 Sep 2013 13:35:43 +0000 (13:35 +0000)]
Prevent assert failure in knife.
It seems sometimes a knife edge with the same
vertex on both ends was created sometimes.

8 years agoFix potential crash in knife.
Howard Trickey [Thu, 19 Sep 2013 12:47:35 +0000 (12:47 +0000)]
Fix potential crash in knife.
A crash was reported but without info to reproduce.
This is a likely crash introduced by previous fix
to allow linehits to snap to vertices.
The function to find connected linehits can't
assume all linehits have edges any more.

8 years agoPotential fix for OSL build issues reported by users: run ldconfig...
Bastien Montagne [Thu, 19 Sep 2013 11:25:47 +0000 (11:25 +0000)]
Potential fix for OSL build issues reported by users: run ldconfig immediately after lib compile (looks like OSL compile process needs boost libs...).

8 years agoFix #36755, EXR Layers are not fully updated on scene load or image refresh.
Lukas Toenne [Thu, 19 Sep 2013 08:21:55 +0000 (08:21 +0000)]
Fix #36755, EXR Layers are not fully updated on scene load or image refresh.
After discussion with Brecht decided that automatically updating the sockets of the node based on externally modified data (removed EXR file passes) is not desirable behavior. But at least making sure
the correct passes are assigned to the output sockets of the Image node is possible. Now the passes are matched by name instead of using the faulty index stored in the socket data, which is more
reliable. Still may break if changing pass names externally, but an image reload is highly recommended anyway and will fix that.

8 years agoFix for OutputFile node, this would crash with unconnected sockets in MultiEXR mode...
Lukas Toenne [Thu, 19 Sep 2013 08:21:53 +0000 (08:21 +0000)]
Fix for OutputFile node, this would crash with unconnected sockets in MultiEXR mode, because it matches sockets and EXR layers by index and was skipping unconnected sockets. Simply create EXR layer info
for all sockets now and then ignore unconnected layers when finally writing to file in deinitExecution.

8 years agospeedup for ngon tessellation, check if the angle is an improvement before doing...
Campbell Barton [Thu, 19 Sep 2013 07:58:47 +0000 (07:58 +0000)]
speedup for ngon tessellation, check if the angle is an improvement before doing the full intersection check.
with 500 verts gives approx 2x speedup.

8 years agominor edits to poly_find_ear() bmesh function, no functional changes.
Campbell Barton [Thu, 19 Sep 2013 07:40:41 +0000 (07:40 +0000)]
minor edits to poly_find_ear() bmesh function, no functional changes.

8 years agofix [#36625] Particle Instances ignores Group offsets
Campbell Barton [Thu, 19 Sep 2013 01:21:34 +0000 (01:21 +0000)]
fix [#36625] Particle Instances ignores Group offsets
in fact this failed for all nested dupli types except for dupli-groups, (which ignore the 'par_space_mat' object_duplilist_recursive()).

8 years agoreplace macro PYC_INTERPRETER_ACTIVE for PyC_IsInterpreterActive() function call,
Campbell Barton [Wed, 18 Sep 2013 23:21:24 +0000 (23:21 +0000)]
replace macro PYC_INTERPRETER_ACTIVE for PyC_IsInterpreterActive() function call,
(indirectly referenced Python define of ~30 lines, most were optimized out but still caused some code bloat).

8 years agostyle cleanup
Campbell Barton [Wed, 18 Sep 2013 23:08:23 +0000 (23:08 +0000)]
style cleanup

8 years agofix [#36771] Prevent 'Apply Transform' for Objects with a linked mesh
Campbell Barton [Wed, 18 Sep 2013 22:45:14 +0000 (22:45 +0000)]
fix [#36771] Prevent 'Apply Transform' for Objects with a linked mesh

8 years agobugfix: [#36641] Maya keymap: Border select doesn't add to selection
Dalai Felinto [Wed, 18 Sep 2013 19:55:48 +0000 (19:55 +0000)]
bugfix: [#36641] Maya keymap: Border select doesn't add to selection

I also replaced all EVT_TWEAK_L by EVT_TWEAK_S
- and replaced B by the gesture mouse for the clip keymaps

8 years agoFix warnings message on load about packed images:
Brecht Van Lommel [Wed, 18 Sep 2013 19:35:13 +0000 (19:35 +0000)]
Fix warnings message on load about packed images:
ERROR: Image not available. Keeping packed image

This was due to recent bugfix for #36639, the image should only be reloaded if
the path actually changed and it's not a packed file.

8 years agoFix memory leak that still existed when opening .blend file mesh data in older
Brecht Van Lommel [Wed, 18 Sep 2013 18:55:12 +0000 (18:55 +0000)]
Fix memory leak that still existed when opening .blend file mesh data in older
Blender versions, previous fix only solved it for newer versions.

Fix a memory leak in packed files.

8 years agoFix #36754: animation not evaluated on object two levels down in dupligroups.
Brecht Van Lommel [Wed, 18 Sep 2013 17:09:28 +0000 (17:09 +0000)]
Fix #36754: animation not evaluated on object two levels down in dupligroups.
Depsgraph would only consider one level, now it works recursive.

8 years agoUVProject modifier was still requiring old tesselated UV data instead of new poly...
Bastien Montagne [Wed, 18 Sep 2013 15:48:24 +0000 (15:48 +0000)]
UVProject modifier was still requiring old tesselated UV data instead of new poly/loop ones.

8 years agofixes for python api docs.
Campbell Barton [Wed, 18 Sep 2013 05:20:43 +0000 (05:20 +0000)]
fixes for python api docs.
also move foreach_get/set examples into their own py example files (prefer not to have example code built into blenders binary).

8 years agofix for missing attribute is_argument_optional when generating docs.
Campbell Barton [Wed, 18 Sep 2013 04:32:29 +0000 (04:32 +0000)]
fix for missing attribute is_argument_optional when generating docs.
also use __slots__ for classes.

8 years agofix relating to bug [#36758],
Campbell Barton [Wed, 18 Sep 2013 01:22:28 +0000 (01:22 +0000)]
fix relating to bug [#36758],
When printing operator reports, ommit unset properties.
This is needed because in some cases operators check if a value is set or not, so filling in default arguments may change behavior.

8 years agofix [#36758] Add Group Instance crash
Campbell Barton [Wed, 18 Sep 2013 00:28:23 +0000 (00:28 +0000)]
fix [#36758] Add Group Instance crash

8 years agostyle cleanup
Campbell Barton [Wed, 18 Sep 2013 00:07:17 +0000 (00:07 +0000)]
style cleanup

8 years agofix [#36211] bridge edge loops joining vertecies that are far away
Campbell Barton [Tue, 17 Sep 2013 23:23:32 +0000 (23:23 +0000)]
fix [#36211] bridge edge loops joining vertecies that are far away

for bridge use a different beautify method when edge loops have non-matching loop count (simple face-angle comparison).

8 years agocomments and more logical var names for bm_edge_calc_rotate_beauty(), (make it easier...
Campbell Barton [Tue, 17 Sep 2013 22:48:08 +0000 (22:48 +0000)]
comments and more logical var names for bm_edge_calc_rotate_beauty(), (make it easier to see whats going on)

8 years agoBGE: Fixing a typo in the collision API that was found by agoose77.
Mitchell Stokes [Tue, 17 Sep 2013 21:00:19 +0000 (21:00 +0000)]
BGE: Fixing a typo in the collision API that was found by agoose77.

8 years agobugfix: [#34663] Cannot rotate view while using Knife tool with Maya preset
Dalai Felinto [Tue, 17 Sep 2013 20:35:17 +0000 (20:35 +0000)]
bugfix: [#34663] Cannot rotate view while using Knife tool with Maya preset

fix as suggested by Ton Roosendaal in tracker:
"the knife tool has a "MODE_PANNING" state, it could be nice to set this
in the modal map as well, to define the shortcut(s) that have to be passed on."

8 years agobugfix [#36757] Vertex coloring in preview window meshes default to black, makes...
Dalai Felinto [Tue, 17 Sep 2013 20:11:02 +0000 (20:11 +0000)]
bugfix [#36757] Vertex coloring in preview window meshes default to black, makes preview useless

Adding 'Col' vertex color layer to preview cycles meshes

The artist could simply disconnect the VCol node from the nodetree for
the preview, but  it should be harmless to add this to the preview meshes.

As long as the user stick to the default vertex color name (and is happy
with seing a all-white channel) it should be ok.

8 years agoFix crash with recently added remove_on_cancel transform property, and hide this
Brecht Van Lommel [Tue, 17 Sep 2013 16:12:05 +0000 (16:12 +0000)]
Fix crash with recently added remove_on_cancel transform property, and hide this
property in the user interface.

8 years agoadd support for trackpad navigation while in knife operator
Dalai Felinto [Tue, 17 Sep 2013 15:20:44 +0000 (15:20 +0000)]
add support for trackpad navigation while in knife operator

I caught this while looking at:
[#34663] Cannot rotate view while using Knife tool with Maya preset

(though it's not the original report).
I'll look at the other operators, there are probably a few in the same
situation as knife.

8 years agoFix #36750: windows crash with empty cycles scene, can't do &references[0] with
Brecht Van Lommel [Tue, 17 Sep 2013 15:03:01 +0000 (15:03 +0000)]
Fix #36750: windows crash with empty cycles scene, can't do &references[0] with
MSVC when references is an empty vector.

8 years agoFix #36718: Wrong lighting on text objects
Sergey Sharybin [Tue, 17 Sep 2013 14:20:00 +0000 (14:20 +0000)]
Fix #36718: Wrong lighting on text objects

In fact, all curve objects were flipped in GLSL mode.
This is because of the way how normals are calculated
for them (inwards vs. outwards).

We might want to make normals consistent all over, but
that would be the bigger change. For ow just made some
tweaks to OpenGL setup.

Thanks Brecht for the review and tests!

8 years agoUpdate foreach_get/_set doc.
Bastien Montagne [Tue, 17 Sep 2013 14:02:13 +0000 (14:02 +0000)]
Update foreach_get/_set doc.

8 years agoFix #36741: cycles AO pass giving values > 1.0 with transparency.
Brecht Van Lommel [Tue, 17 Sep 2013 13:22:42 +0000 (13:22 +0000)]
Fix #36741: cycles AO pass giving values > 1.0 with transparency.

8 years agoFix for #36739: Delete new nodes added via the Add menu or toolbar if the subsequent...
Lukas Toenne [Tue, 17 Sep 2013 13:07:48 +0000 (13:07 +0000)]
Fix for #36739: Delete new nodes added via the Add menu or toolbar if the subsequent transform operator is cancelled. This prevents ugly situations where nodes stick "under" the toolbar after clicking a
wrong button.

Works by adding a flag to transform operators "remove_on_cancel". This is currently only used for node transforms, the idea is that if set, the operator will remove the transformed elements when it is
cancelled. It's not possible to do that in the original NODE_OT_add_node operator, because transform is modal and there is no way of reacting to a cancel outside of the transform itself (previous attempt
used a macro operator, but that also doesn't work because subsequent operators don't get executed if the previous transform cancels).

8 years agoFix #36748 Sculpting/image painting does not respect undo steps limit.
Antony Riakiotakis [Tue, 17 Sep 2013 12:11:00 +0000 (12:11 +0000)]
Fix #36748 Sculpting/image painting does not respect undo steps limit.

A simple oversight here, it should work as intended now.

Nice to have it functional for people who might hate dyntopo undo with a

8 years agoFix py/numpy build under Suse, and minor other fixes/enhancements.
Bastien Montagne [Tue, 17 Sep 2013 11:01:52 +0000 (11:01 +0000)]
Fix py/numpy build under Suse, and minor other fixes/enhancements.
Also switch to python3.3.2

8 years agoFix #36747: curve bevel and extrude issue
Sergey Sharybin [Tue, 17 Sep 2013 11:00:09 +0000 (11:00 +0000)]
Fix #36747: curve bevel and extrude issue

Was a small mistake in bevel list optimization,
no need to check whether first/last points are
the same coord if curve is not cyclic.

8 years agoSomplify one-liner for CPU cores detection and make it aware of multi-CPU computers
Sergey Sharybin [Tue, 17 Sep 2013 09:17:10 +0000 (09:17 +0000)]
Somplify one-liner for CPU cores detection and make it aware of multi-CPU computers

8 years agoSetting keyframe is now possible for tracks which doesn't have marker at current...
Sergey Sharybin [Tue, 17 Sep 2013 08:58:12 +0000 (08:58 +0000)]
Setting keyframe is now possible for tracks which doesn't have marker at current frame

8 years agoRe-track the plane after clearing the keyframe
Sergey Sharybin [Tue, 17 Sep 2013 08:54:10 +0000 (08:54 +0000)]
Re-track the plane after clearing the keyframe

From the math point of view there're two cases:

- Clearing the keyframe between two other ones.

  In this case tracker will first track plane from
  left keyframe to right one without doing any kind
  of blending. This will make plane stick to the
  actual plane motion, but lead to possible jump
  at the right keyframe.

  Second step is to track from the right keyframe
  to the left one with blending. This gives nice
  transition at the point of second keyframe and
  this mimics situation when you've been setting
  keyframes from left to right.

- Clearing left-most/right-most keyframe.

  In this case it's enough to only re-track the
  plane without blending from the neighbor keyframe
  without blending.

8 years agoMuted footage in MCE still was reading the frames from disk
Sergey Sharybin [Tue, 17 Sep 2013 08:43:35 +0000 (08:43 +0000)]
Muted footage in MCE still was reading the frames from disk

Wasn't so much great from speed point of view.

8 years agofix [#36246] Weight tools do not mirror properly in vertex selection mask mode.
Campbell Barton [Tue, 17 Sep 2013 07:03:13 +0000 (07:03 +0000)]
fix [#36246] Weight tools do not mirror properly in vertex selection mask mode.

Weight mirror is now supported by invert/clean/levels/blend.

8 years agovertex group blend, support for blending multiple groups at once.
Campbell Barton [Tue, 17 Sep 2013 06:47:47 +0000 (06:47 +0000)]
vertex group blend, support for blending multiple groups at once.

8 years agominor renaming (adding related functions in future commits).
Campbell Barton [Tue, 17 Sep 2013 04:19:45 +0000 (04:19 +0000)]
minor renaming (adding related functions in future commits).

8 years agoadd unused hair bsdf glsl callback function to register_node_type_sh_bsdf_hair()
Campbell Barton [Tue, 17 Sep 2013 00:24:46 +0000 (00:24 +0000)]
add unused hair bsdf glsl callback function to register_node_type_sh_bsdf_hair()

8 years agoFix #36731: border render not updating properly with persistent images
Brecht Van Lommel [Mon, 16 Sep 2013 21:20:21 +0000 (21:20 +0000)]
Fix #36731: border render not updating properly with persistent images
setting enabled in cycles.

8 years agoFix #36738: object ray visibility flags not working in cycles viewport if there
Brecht Van Lommel [Mon, 16 Sep 2013 21:05:43 +0000 (21:05 +0000)]
Fix #36738: object ray visibility flags not working in cycles viewport if there
is only a single object in the scene.

8 years agoFix #36725: mismatch between viewport and render result when no world is linked
Brecht Van Lommel [Mon, 16 Sep 2013 21:05:42 +0000 (21:05 +0000)]
Fix #36725: mismatch between viewport and render result when no world is linked
to the scene in cycles.

8 years agoFix wrong temporary path in user preferences, revert startup.blend and instead
Brecht Van Lommel [Mon, 16 Sep 2013 21:05:39 +0000 (21:05 +0000)]
Fix wrong temporary path in user preferences, revert startup.blend and instead
do the freestyle changes in BLO_update_defaults_startup_blend.

8 years agoFix [#36742] Pasting image into text editor causes freeze
Bastien Montagne [Mon, 16 Sep 2013 18:14:04 +0000 (18:14 +0000)]
Fix [#36742] Pasting image into text editor causes freeze

Last fallback (XCLIB_XCOUT_FALLBACK_TEXT) was not checked, hence infinitly looping...

8 years agoGrrr, forgot to update getopt command for updated args...
Bastien Montagne [Mon, 16 Sep 2013 15:48:37 +0000 (15:48 +0000)]
Grrr, forgot to update getopt command for updated args...

8 years agoCode cleanup / Cycles:
Thomas Dinges [Mon, 16 Sep 2013 15:40:50 +0000 (15:40 +0000)]
Code cleanup / Cycles:
* Avoid some duplicated code for switch/case in the Attribute code.

8 years agoCycles / Hair:
Thomas Dinges [Mon, 16 Sep 2013 15:34:31 +0000 (15:34 +0000)]
Cycles / Hair:
* Hair rendering is now a supported feature, no further need to change the feature set to "Experimental".

8 years agobugfix [#36736] You can still transform objects while navigating view
Dalai Felinto [Mon, 16 Sep 2013 15:33:28 +0000 (15:33 +0000)]
bugfix [#36736] You can still transform objects while navigating view

Bug was in maya preset.
view3d.manipulator was defined twice, and it was taken precedent over view3d.rotate

8 years agoAdd --required-numpy to force compilation of both py3.3 and numpy1.7 in case you...
Bastien Montagne [Mon, 16 Sep 2013 15:22:10 +0000 (15:22 +0000)]
Add --required-numpy to force compilation of both py3.3 and numpy1.7 in case you really need numpy and 1.7 is not available!

8 years agoMaking correctly see hyperthreading
Daniel Salazar [Mon, 16 Sep 2013 14:38:33 +0000 (14:38 +0000)]
Making correctly see hyperthreading

8 years agopartial bugfix: [#36501] Blenderplayer can not change video resolution in Mac OSX
Dalai Felinto [Mon, 16 Sep 2013 13:24:28 +0000 (13:24 +0000)]
partial bugfix: [#36501] Blenderplayer can not change video resolution in Mac OSX
OSX support for native desktop resolution changing is not simple as for Windows or Linux.

The 'fix' here is at the interface level only.
Refer to the original bug report for the suggested native workaround, test patch and problems.

8 years agoFix issue with paint cursor overlay and size pressure drawing, it would
Antony Riakiotakis [Mon, 16 Sep 2013 13:03:28 +0000 (13:03 +0000)]
Fix issue with paint cursor overlay and size pressure drawing, it would
draw incorrectly and leave openGL in an inconsistent state, making for a
quite surreal UI. Reported by Sebastian Koenig thanks!

8 years updates:
Bastien Montagne [Mon, 16 Sep 2013 13:02:49 +0000 (13:02 +0000)] updates:
* Raise OpenCOLLADA version to 18da7f4109a8eafaa290a33f5550501cc4c8bae8 as requested by Gaia.
* Made OSL build/install ON by default (no more an experimental feature!).
* Use default LLVM version under Debian (specifying a version does not work with OSL when you have more that one installed :( ).

8 years agoFix #36734 Matcap displays solid black.
Lukas Toenne [Mon, 16 Sep 2013 11:40:04 +0000 (11:40 +0000)]
Fix #36734 Matcap displays solid black.
GLSL typo in r60151 caused this.

8 years agofix [#36732] Auto depth feature misbehaves on orbit with mouse cursor outside the...
Campbell Barton [Mon, 16 Sep 2013 08:59:54 +0000 (08:59 +0000)]
fix [#36732] Auto depth feature misbehaves on orbit with mouse cursor outside the model.

ortho mode didn't store the depth for re-use when the cursor had no depth.

8 years agofix [#36291] Applying subsurf to mesh or setting subdivisions to zero crashes Blender
Campbell Barton [Mon, 16 Sep 2013 06:00:25 +0000 (06:00 +0000)]
fix [#36291] Applying subsurf to mesh or setting subdivisions to zero crashes Blender

issue was mesh somehow had a mismatch of UV/texpoly layers. we may want to allow this in the future but for now sync on load just in case.

8 years agofix [#36537] "Grid Floor Scaling" can have some unexpected behaviour on new objects
Campbell Barton [Mon, 16 Sep 2013 04:19:48 +0000 (04:19 +0000)]
fix [#36537] "Grid Floor Scaling" can have some unexpected behaviour on new objects

curves and metaballs now behave the same as meshes wrt grid scaling.
remove WM_operator_view3d_distance_invoke(), and replace with a function called from exec which initializes defaults, this way operators can have their own invoke functions.

8 years agofix [#36444] view3d.viewnumpad operator should not animate
Campbell Barton [Mon, 16 Sep 2013 04:04:44 +0000 (04:04 +0000)]
fix [#36444] view3d.viewnumpad operator should not animate

when running viewport operations with exec() rather then invoke(), perform the action immediately rather then using smoothview.
makes viewport operations usable from python scripts.

8 years agoUndo the front-facing only commit for clay strips brushes, it adds an
Antony Riakiotakis [Mon, 16 Sep 2013 02:24:41 +0000 (02:24 +0000)]
Undo the front-facing only commit for clay strips brushes, it adds an
attenuation that should really be optional. There's also a minor
performance penalty and all this only for one problematic case. In case
the tool flattens two surfaces, users can manually set the front face
only option. A better non-attenuating way to cull such vertices can be
added later.

Also flatten brush should calculate the flatten plane from the original
vertices or the flattening will not converge for planes offsets
different than zero.

Reported by Michalis Zissiou, thanks!

8 years agoreplace RNA_property_array_length with RNA_property_array_check where the length...
Campbell Barton [Mon, 16 Sep 2013 01:35:52 +0000 (01:35 +0000)]
replace RNA_property_array_length with RNA_property_array_check where the length of the array is only used to check if the property is an array or not.
(this isnt reliable since arrays can be zero length).

8 years agomove make_prim_radius_prop into a generic function.
Campbell Barton [Mon, 16 Sep 2013 00:18:09 +0000 (00:18 +0000)]
move make_prim_radius_prop into a generic function.

8 years agomove editcurve add functions into their own source file editcurve_add.c
Campbell Barton [Mon, 16 Sep 2013 00:03:33 +0000 (00:03 +0000)]
move editcurve add functions into their own source file editcurve_add.c

8 years agoCycles Hair: Two basic bair shaders added
Stuart Broadfoot [Sun, 15 Sep 2013 23:58:00 +0000 (23:58 +0000)]
Cycles Hair: Two basic bair shaders added

A new hair bsdf node, with two closure options, is added. These closures allow the generation of the reflective and transmission components of hair. The node allows control of the highlight colour, roughness and angular shift.

Llimitations include:
-No glint or fresnel adjustments.
-The 'offset' is un-used when triangle primitives are used.