7 years agoCMake: mark vars as advanced
Campbell Barton [Mon, 5 May 2014 20:03:52 +0000 (06:03 +1000)]
CMake: mark vars as advanced

7 years agoFix T39956.
Antony Riakiotakis [Mon, 5 May 2014 19:39:55 +0000 (22:39 +0300)]
Fix T39956.

Even locked shape keys need to be flushed if user is in textured or
wireframe mode.

7 years agoHidden PBVH nodes:
Antony Riakiotakis [Mon, 5 May 2014 19:21:30 +0000 (22:21 +0300)]
Hidden PBVH nodes:

Set hidden when rebuilding the PBVH tree if all primitives are hidden.

7 years agoDrop support for MSVC versions older then 2013 with CMake
Campbell Barton [Mon, 5 May 2014 19:03:19 +0000 (05:03 +1000)]
Drop support for MSVC versions older then 2013 with CMake

We get too many complaints about breakage and we intend to drop older versions soon anyway.

7 years agoMake bpy.types.EditBone.matrix writeable.
Bastien Montagne [Mon, 5 May 2014 18:56:38 +0000 (20:56 +0200)]
Make bpy.types.EditBone.matrix writeable.

Makes importing armatures from matrices (FBX...) *much* easier.

7 years agoInstall_deps: explicitely disable OSL/LLVM seems needed...
Bastien Montagne [Mon, 5 May 2014 18:46:30 +0000 (20:46 +0200)]
Install_deps: explicitely disable OSL/LLVM seems needed...

7 years agoAttempt to solve T39950,
Antony Riakiotakis [Mon, 5 May 2014 18:13:27 +0000 (21:13 +0300)]
Attempt to solve T39950,

Avoid filling up buffers when total buffer triangles are zero.

Better still would be to tag a node as hidden when doing recreation of
the PBVH tree by checking for any visible elements. Original bug report
probably has to do with OpenGL doing something funky but hidden nodes
should be tagged as hidden to completely avoid iterating for painting.
This is to be done in a later commit.

Also some naming cleanup for consistency, GPU_build_pbvh_mesh_buffers to

7 years agoFix T39322, hair not rendered in rendered mode viewport after returning
Antony Riakiotakis [Mon, 5 May 2014 16:51:58 +0000 (19:51 +0300)]
Fix T39322, hair not rendered in rendered mode viewport after returning
from particle edit mode.

Check for object particle edit mode, not psys->edit. This won't get
freed on exit (which might be worth considering doing, maybe?)

7 years agoFix T40032: hair BSDF not working correct after primitive type code refactoring.
Brecht Van Lommel [Mon, 5 May 2014 15:14:46 +0000 (17:14 +0200)]
Fix T40032: hair BSDF not working correct after primitive type code refactoring.

7 years agoFix T40031: cycles deformation motion blur wrong render on last frame of animation.
Brecht Van Lommel [Mon, 5 May 2014 14:35:20 +0000 (16:35 +0200)]
Fix T40031: cycles deformation motion blur wrong render on last frame of animation.

7 years agoAnother attempt to fully fix T40020: Freestyle: dashed lines crashes blender.
Tamito Kajiyama [Mon, 5 May 2014 13:30:00 +0000 (22:30 +0900)]
Another attempt to fully fix T40020: Freestyle: dashed lines crashes blender.

Problem report by flokkievids through rB047c3aa728a4bb944616a084805988714b796d52#1.

7 years agoFreestyle: Revised a UI text for better understandability in the Outliner.
Tamito Kajiyama [Mon, 5 May 2014 07:40:31 +0000 (16:40 +0900)]
Freestyle: Revised a UI text for better understandability in the Outliner.

7 years agoFix T40029: Apply transform to empties reset their location
Campbell Barton [Mon, 5 May 2014 05:41:08 +0000 (15:41 +1000)]
Fix T40029: Apply transform to empties reset their location

also add check for negative scale

7 years agoStop all dynamic enums using translations (from blend file data)
Campbell Barton [Mon, 5 May 2014 05:22:36 +0000 (15:22 +1000)]
Stop all dynamic enums using translations (from blend file data)

7 years agoFix: T40016 ID Names translated in menus
Campbell Barton [Mon, 5 May 2014 05:09:29 +0000 (15:09 +1000)]
Fix: T40016 ID Names translated in menus

7 years agoFix T40020: Freestyle: dashed lines crashes blender.
Tamito Kajiyama [Mon, 5 May 2014 02:32:43 +0000 (11:32 +0900)]
Fix T40020: Freestyle: dashed lines crashes blender.

The crash was due to an out-of-range vertex index reference that occured while
computing texture coordinates of strokes with tips.

7 years agoCode cleanup
Campbell Barton [Mon, 5 May 2014 02:29:28 +0000 (12:29 +1000)]
Code cleanup

7 years agoNLA Pushdown Operator: Active animdata option + More error handling
Joshua Leung [Mon, 5 May 2014 02:15:28 +0000 (14:15 +1200)]
NLA Pushdown Operator: Active animdata option + More error handling

* If channel_index = -1, the pushdown operator will try to use the active AnimData
  block. To see which one this will be, check the properties (NKEY) region in NLA Editor.
* Added more detailed error handling for the various cases where things are not
  in a valid state for pushing down an action. This is notably to stop scripters
  from putting the NLA into an inconsistent state.

7 years agoNLA Editor: Added dedicated operator for the pushdown operation
Joshua Leung [Mon, 5 May 2014 01:59:36 +0000 (13:59 +1200)]
NLA Editor: Added dedicated operator for the pushdown operation

7 years agoCode Cleanup: Remove old deprecated NLA channel drawing code
Joshua Leung [Mon, 5 May 2014 00:49:26 +0000 (12:49 +1200)]
Code Cleanup: Remove old deprecated NLA channel drawing code

7 years agoNLA Editor: Polishing a few rough edges with the cleanup
Joshua Leung [Mon, 5 May 2014 00:49:11 +0000 (12:49 +1200)]
NLA Editor: Polishing a few rough edges with the cleanup

7 years agoNLA Editor: Second part of porting NLA Action channel to standard drawing system
Joshua Leung [Sun, 4 May 2014 15:32:23 +0000 (03:32 +1200)]
NLA Editor: Second part of porting NLA Action channel to standard drawing system

This now works (barring one or two minor glitches and the operator on the pushdown
button being a bit of a hack). The old drawing code is still in place though, and
will be kept around for a little while yet while the last kinks are ironed out.

7 years agoNLA Editor Drawing: Set up AnimChannelType callbacks for drawing NLA Editor
Joshua Leung [Sun, 4 May 2014 14:57:36 +0000 (02:57 +1200)]
NLA Editor Drawing: Set up AnimChannelType callbacks for drawing NLA Editor

This commit lays some of the groundwork needed to port the last of the NLA Editor
channel types that's still defined using custom code. By moving this code over
to the newer standardised framework, this will enable widgets to have tooltips
to make it easier for users to find out what various buttons do.

Currently this isn't hooked up to anything though.

7 years agoFix T39928: Blender crash/freeze when game engine is started with animation played...
Mitchell Stokes [Sun, 4 May 2014 22:37:18 +0000 (15:37 -0700)]
Fix T39928: Blender crash/freeze when game engine is started with animation played directly on camera object with parents.

Updating object IPOs is not currently thread-safe since it also updates
children. This leads to problems when parents and children are both
animated. For now, updating object IPOs is done in its own loop to avoid
threading issues.

7 years agoAdd check for LIKELY/UNLIKELY is CPU only
Campbell Barton [Sun, 4 May 2014 21:26:49 +0000 (07:26 +1000)]
Add check for LIKELY/UNLIKELY is CPU only

7 years agoCycles: avoid int->float conversions for pixel lookups
Campbell Barton [Sun, 4 May 2014 20:57:33 +0000 (06:57 +1000)]
Cycles: avoid int->float conversions for pixel lookups

Gives ~3% speedup for image.blend test, and 6% for image heavy file.

Overall speedup in real-world use is likely much less.

7 years agoFix T40025: generating wrong make flag for OSL
Bastien Montagne [Sun, 4 May 2014 19:32:06 +0000 (21:32 +0200)]
Fix T40025: generating wrong make flag for OSL

Most cases should be handled OK now (not all though, would make script way too much tricky -
bash is a hell of a messy language :/).

7 years agoCycles: use LIKELY/UNLIKELY macros
Campbell Barton [Sun, 4 May 2014 17:49:22 +0000 (03:49 +1000)]
Cycles: use LIKELY/UNLIKELY macros

Gives overall ~3% speedup in own tests for BMW scene.

7 years agoStyle cleanup: indentation, braces
Campbell Barton [Sun, 4 May 2014 16:19:08 +0000 (02:19 +1000)]
Style cleanup: indentation, braces

7 years agoCode cleanup: avoid int/uint mixup in cycles
Campbell Barton [Sun, 4 May 2014 15:30:02 +0000 (01:30 +1000)]
Code cleanup: avoid int/uint mixup in cycles

7 years agoFixes for errors uncovered after previous commit
Joshua Leung [Sun, 4 May 2014 11:28:27 +0000 (23:28 +1200)]
Fixes for errors uncovered after previous commit

7 years agoCode cleanup: Use enum instead of int in function signatures for bAnimChannelType...
Joshua Leung [Sun, 4 May 2014 11:19:40 +0000 (23:19 +1200)]
Code cleanup: Use enum instead of int in function signatures for bAnimChannelType settings callbacks

7 years agoNLA Editor: Display "tweaking action" status indicator icon in place of action-type...
Joshua Leung [Sun, 4 May 2014 07:28:14 +0000 (19:28 +1200)]
NLA Editor: Display "tweaking action" status indicator icon in place of action-type icon

Instead of displaying the "tweaking action" status indicator icon on the right hand
side jammed against the mapping/no-mapping toggle (pin), this is now displayed as in
place of the action icon used on the left (as the type indicator). This is less messy
than the previous situation, which was needed partly due to the abuse of an unsuited

7 years agoNLA Editor: Added dedicated icons for "pushdown" operator and for indicating the...
Joshua Leung [Sun, 4 May 2014 07:19:39 +0000 (19:19 +1200)]
NLA Editor: Added dedicated icons for "pushdown" operator and for indicating the "tweaking" state

1) The "pushdown" operation is the actual name for the functionality
   previously represented by the snowflake. That is, pushing the active
   action onto the NLA stack as a new strip.

   The icon that is introduced here is the icon I originally wanted to
   use here for this purpose (but couldn't at the time the NLA was coded
   as we didn't have the master SVG available yet). I'm making this change
   now to hopefully make the "animation-layers" intentions behind the NLA
   design a lot clearer than they have been so far.

2) Also added a dedicated icon for representing that the active action
   is in the "tweaking" state (i.e. we're editing a particular strip's
   action). Previously we were abusing an icon designed for an entirely
   different purpose, mainly since its identifier looked like it would work.

7 years agoNLA Eval Bugfix: Influence settings on active action didn't work
Joshua Leung [Sat, 3 May 2014 10:08:35 +0000 (22:08 +1200)]
NLA Eval Bugfix: Influence settings on active action didn't work

* The automatically calculated influence was overriding the value we were passing
  into the dummy strip, making this seem like it doesn't work

* Made some tweaks to prevent some potential memory-related bugs
   - nlastrips_ctime_get_strip() actually saves off references to the list of strips
     it gets, so declaring dummy_strip in an inner scope like this could potentially
     be quite dangerous
   - Prevented a potential memory leak for the early abort when there are no strips
     for whatever reason (it shouldn't occur though)

7 years agoFix typo (uninitialized var)
Campbell Barton [Sun, 4 May 2014 02:36:44 +0000 (12:36 +1000)]
Fix typo (uninitialized var)

7 years agoFix T40010: Single user looses parent relationship (temporarily)
Campbell Barton [Sat, 3 May 2014 22:34:47 +0000 (08:34 +1000)]
Fix T40010: Single user looses parent relationship (temporarily)

7 years agoFix for aligned handles in masking and curve objects
Sergey Sharybin [Sat, 3 May 2014 19:58:02 +0000 (21:58 +0200)]
Fix for aligned handles in masking and curve objects

The issue has been introduced in 0985bb4, made it so curves and masks
stick to old behavior.

FCurves are still flaky, namely, grabbing both handles selected would
change the length of one of the handles which is not nice imo.

7 years agoCode cleanup: style, require ; for cuda_assert, opencl_assert
Campbell Barton [Sat, 3 May 2014 17:49:56 +0000 (03:49 +1000)]
Code cleanup: style, require ; for cuda_assert, opencl_assert

7 years agoQuiet float conversion warnings when building cycles standalone
Campbell Barton [Sat, 3 May 2014 17:15:20 +0000 (03:15 +1000)]
Quiet float conversion warnings when building cycles standalone

7 years agoCode cleanup: style
Campbell Barton [Sat, 3 May 2014 14:04:12 +0000 (00:04 +1000)]
Code cleanup: style

7 years agoFix T39997: Multiple boolean modifiers sharing the same right operand crashes
Sergey Sharybin [Sat, 3 May 2014 13:58:37 +0000 (15:58 +0200)]
Fix T39997: Multiple boolean modifiers sharing the same right operand crashes

The issue was caused by the temporary CD layers being allocated for subsurf
meshes, same as we've got back in 881fb43.

In the long run this temporary storage is to be re-considered, but it'll also
imply re-considering of the Derivedmesh interaction as well. For now let's
use a simpler solution which is forbidding modifiers to call getArray for other
objects' derivedMeshes but use an API calls which would allocate local copy of
the data preventing race condition of shared data in DM.

7 years agoDoxy cleanup: formatting
Campbell Barton [Sat, 3 May 2014 13:43:36 +0000 (23:43 +1000)]
Doxy cleanup: formatting

7 years agoMinor code style fix.
Tamito Kajiyama [Fri, 2 May 2014 03:33:24 +0000 (12:33 +0900)]
Minor code style fix.

7 years agoAdded support for the Make Local command in the Outliner on textures in line styles.
Tamito Kajiyama [Wed, 23 Apr 2014 06:35:55 +0000 (15:35 +0900)]
Added support for the Make Local command in the Outliner on textures in line styles.

7 years agoAdded changes to unlink textures from line styles in the Outliner.
Tamito Kajiyama [Wed, 23 Apr 2014 06:08:41 +0000 (15:08 +0900)]
Added changes to unlink textures from line styles in the Outliner.

7 years agoAdded changes to show textures as part of line styles in the Outliner.
Tamito Kajiyama [Wed, 23 Apr 2014 06:07:04 +0000 (15:07 +0900)]
Added changes to show textures as part of line styles in the Outliner.

7 years agoAdded notifier of updates in Freestyle texture slots.
Tamito Kajiyama [Wed, 23 Apr 2014 04:39:58 +0000 (13:39 +0900)]
Added notifier of updates in Freestyle texture slots.

7 years agoFix for missing initialization and copying of FreestyleLineStyle::pr_texture value.
Tamito Kajiyama [Wed, 23 Apr 2014 04:38:19 +0000 (13:38 +0900)]
Fix for missing initialization and copying of FreestyleLineStyle::pr_texture value.

7 years agoMake blenderplayer compilable again after recent commit b7f085d9c128f31d576c732c6439b...
Thomas Beck [Sat, 3 May 2014 10:49:21 +0000 (12:49 +0200)]
Make blenderplayer compilable again after recent commit b7f085d9c128f31d576c732c6439b5a71e8922ee by Tamito.

Inserted a stub in stub.c and added the struct keyword to make gcc happy

7 years agoinstall_deps: always specify openexr/ilmbase versions to OIIO and OSL cmake, might...
Bastien Montagne [Sat, 3 May 2014 10:44:44 +0000 (12:44 +0200)]
install_deps: always specify openexr/ilmbase versions to OIIO and OSL cmake, might help in some cases...

7 years agoPatch D246: Texture Marks for freestyle strokes, written and contributed by Paolo...
Tamito Kajiyama [Sat, 3 May 2014 09:51:53 +0000 (18:51 +0900)]
Patch D246: Texture Marks for freestyle strokes, written and contributed by Paolo Acampora.

Reviewers: brecht, kjym3, #freestyle

Reviewed By: brecht, kjym3

Differential Revision:

7 years agoAlternative fix for T39941, this also fixes odd behavior of rendered preview.
IRIE Shinsuke [Wed, 30 Apr 2014 06:29:03 +0000 (15:29 +0900)]
Alternative fix for T39941, this also fixes odd behavior of rendered preview.

The rendered preview didn't show active layer or wasn't updated if the
layer was disabled. Now the viewport always shows an active layer regardless
of whether it's enabled or disabled.

7 years agoComment out scons '-Werror=float-conversion' for Cycles for now.
Bastien Montagne [Sat, 3 May 2014 09:08:27 +0000 (11:08 +0200)]
Comment out scons '-Werror=float-conversion' for Cycles for now.

This option is only available in gcc >= 4.9, and we do not have a fancy helper in scons
to check availability of a flag...

7 years agoFix '-Werror=float-conversion' error with gcc < 4.9, for CMake
Bastien Montagne [Sat, 3 May 2014 08:54:02 +0000 (10:54 +0200)]
Fix '-Werror=float-conversion' error with gcc < 4.9, for CMake

Scons is still TODO.

7 years agoFix T40001: Opening a 2.66 blend file in 2.7, a bone appear "rolled but not rolled".
Bastien Montagne [Sat, 3 May 2014 06:49:29 +0000 (08:49 +0200)]
Fix T40001: Opening a 2.66 blend file in 2.7, a bone appear "rolled but not rolled".

Looks like some sign was lost in that complex matrix algebra (always be wary of squared values!).

7 years agoNLA Editor: Show correct tooltip for "NLA Mute" on datablock expanders
Joshua Leung [Fri, 2 May 2014 07:37:24 +0000 (19:37 +1200)]
NLA Editor: Show correct tooltip for "NLA Mute" on datablock expanders

7 years agoSpelling fix
Joshua Leung [Fri, 2 May 2014 03:32:09 +0000 (15:32 +1200)]
Spelling fix

7 years agoCycles: CUDA changes for kernel evaluation cancel
Brecht Van Lommel [Wed, 30 Apr 2014 16:16:48 +0000 (13:16 -0300)]
Cycles: CUDA changes for kernel evaluation cancel

7 years agoCycles Bake
Dalai Felinto [Thu, 2 Jan 2014 21:05:07 +0000 (19:05 -0200)]
Cycles Bake

Expand Cycles to use the new baking API in Blender.

It works on the selected object, and the panel can be accessed in the Render panel (similar to where it is for the Blender Internal).

It bakes for the active texture of each material of the object. The active texture is currently defined as the active Image Texture node present in the material nodetree. If you don't want the baking to override an existent material, make sure the active Image Texture node is not connected to the nodetree. The active texture is also the texture shown in the viewport in the rendered mode.

Remember to save your images after the baking is complete.

Note: Bake currently only works in the CPU
Note: This is not supported by Cycles standalone because a lot of the work is done in Blender as part of the operator only, not the engine (Cycles).


Supported Passes:
Data Passes
 * Normal
 * UV
 * Diffuse/Glossy/Transmission/Subsurface/Emit Color

Light Passes
 * AO
 * Combined
 * Shadow
 * Diffuse/Glossy/Transmission/Subsurface/Emit Direct/Indirect
 * Environment

Review: D421
Reviewed by: Campbell Barton, Brecht van Lommel, Sergey Sharybin, Thomas Dinge

Original design by Brecht van Lommel.

The entire commit history can be found on the branch: bake-cycles

7 years agoBake API - bpy.ops.object.bake()
Dalai Felinto [Thu, 2 Jan 2014 21:05:07 +0000 (19:05 -0200)]
Bake API - bpy.ops.object.bake()

New operator that can calls a bake function to the current render engine when available. This commit provides no feature for the users, but allows external engines to be accessed by the operator and be integrated with the baking api.

The API itself is simple. Blender sends a populated array of BakePixels to the renderer, and gets back an array of floats with the result.

The Blender Internal (and multires) system is still running independent, but we eventually will pipe it through the API as well. Cycles baking will come next as a separated commit

Python Operator:
The operator can be called with some arguments, or a user interface can be created for it. In that case the arguments can be ommited and the interface can expose the settings from bpy.context.scene.render.bake

bpy.ops.object.bake(type='COMBINED', filepath="", width=512, height=512, margin=16, use_selected_to_active=False, cage_extrusion=0, cage="", normal_space='TANGENT', normal_r='POS_X', normal_g='POS_Y', normal_b='POS_Z', save_mode='INTERNAL', use_clear=False, use_split_materials=False, use_automatic_name=False)
Note: external save mode is currently disabled.

Supported Features:
 * Margin - Baked result is extended this many pixels beyond the border of each UV "island," to soften seams in the texture.

 * Selected to Active - bake shading on the surface of selected object to the active object. The rays are cast from the lowpoly object inwards towards the highpoly object. If the highpoly object is not entirely involved by the lowpoly object, you can tweak the rays start point with Cage Extrusion. For even more control of the cage you can use a Cage object.

 * Cage Extrusion - distance to use for the inward ray cast when using selected to active

 * Custom Cage - object to use as cage (instead of the lowpoly object).

 * Normal swizzle - change the axis that gets mapped to RGB

 * Normal space - save as tangent or object normal spaces

Supported Passes:
Any pass that is supported by Blender renderlayer system. Though it's up to the external engine to provide a valid enum with its supported passes. Normal passes get a special treatment since we post-process them to converted and "swizzled"

Development Notes for External Engines:
(read them in bake_api.c)

* For a complete implementation example look at the Cycles Bake commit (next).

Review: D421
Reviewed by: Campbell Barton, Brecht van Lommel, Sergey Sharybin, Thomas Dinge

Normal map pipeline "consulting" by Andy Davies (metalliandy)
Original design by Brecht van Lommel.

The entire commit history can be found on the branch: bake-cycles

7 years agoIMB buffer functions to take a mask as input
Dalai Felinto [Sat, 26 Apr 2014 00:34:00 +0000 (21:34 -0300)]
IMB buffer functions to take a mask as input

The mask make sure the conversion only happens in a few areas of the

New Functions:
* IMB_buffer_byte_from_float_mask
* IMB_buffer_float_from_float_mask

The functions are an adaptation of their maskless counterparts without accepting different profiles for the input and output buffers.

Review: Sergey Sharybin

7 years agoBLI_path_suffix() - new path util functon to add a suffix to a filepath (before the...
Dalai Felinto [Wed, 16 Apr 2014 17:25:23 +0000 (14:25 -0300)]
BLI_path_suffix() - new path util functon to add a suffix to a filepath (before the extension)

Revision: D465
Reviewd by Campbell Barton

7 years agoUI: more changes for large textfields
Campbell Barton [Fri, 2 May 2014 23:18:00 +0000 (09:18 +1000)]
UI: more changes for large textfields

- no longer set 'but->drawstr' when editing buttons.
- clip text and set cursor based on the 'editstr'.

7 years agoCode cleanup: Add -Werror=float-conversion to Cycles
Campbell Barton [Fri, 2 May 2014 21:22:14 +0000 (07:22 +1000)]
Code cleanup: Add -Werror=float-conversion to Cycles

7 years agoFix for paste clamping the string length to UI_MAX_DRAW_STR
Campbell Barton [Fri, 2 May 2014 20:06:19 +0000 (06:06 +1000)]
Fix for paste clamping the string length to UI_MAX_DRAW_STR

7 years agoFix T39924: 400 character limit in text fields
Campbell Barton [Fri, 2 May 2014 19:03:55 +0000 (05:03 +1000)]
Fix T39924: 400 character limit in text fields

7 years agoFix incorrect sizes used copying panel idname, tabname.
Campbell Barton [Fri, 2 May 2014 18:16:04 +0000 (04:16 +1000)]
Fix incorrect sizes used copying panel idname, tabname.

7 years agoFix T39985: crash while rendering a scene with compositing nodes using another scene
Sergey Sharybin [Fri, 2 May 2014 12:52:19 +0000 (14:52 +0200)]
Fix T39985: crash while rendering a scene with compositing nodes using another scene

The issue was caused by the wrong scene used to acquire render result for.

Now made it so render pipeline reports currently rendering scene to the job
via special callback.

This also solves missing tile highlight issue when rendering multiple scenes
in the compositor.

7 years agoFix for missing render layer display buffer allocation
Sergey Sharybin [Fri, 2 May 2014 12:32:52 +0000 (14:32 +0200)]
Fix for missing render layer display buffer allocation

7 years agoFix T39966: Whole Group option of dupligroup visualization of particles
Lukas Tönne [Fri, 2 May 2014 11:08:15 +0000 (13:08 +0200)]
Fix T39966: Whole Group option of dupligroup visualization of particles
does not work as expected for Viewport and Blender Internal.

As @sergey noticed, this was caused by rBfbf8595, which disabled
rendering for wireframe objects in the viewport. However, the same
function `is_object_hidden` is also used for skipping dupli objects then
which may themselves be renderable.

Now use two variants:
* is_object_restricted is the previous test for general viewport/render visibility (lets wireframe duplicators pass)
* is_object_hidden includes the wireframe check for actual render instances

7 years agoFix T39989: Dupli group's objects in Particles are not displayed properly in 3D View
Sergey Sharybin [Fri, 2 May 2014 09:26:59 +0000 (11:26 +0200)]
Fix T39989: Dupli group's objects in Particles are not displayed properly in 3D View

It was broken in 7544961 and the proper way is to make sure proper obmat is being
copied to object before the draw.

Doing obmat copy in advance doesn't really work because object might appear multiple
times in the duplilist.

7 years agoFix T39984: Interpolation errors in particle emitter animation.
Lukas Tönne [Fri, 2 May 2014 07:55:02 +0000 (09:55 +0200)]
Fix T39984: Interpolation errors in particle emitter animation.

Reverse child->parent order of particle emitter animation eval causes
artifacts when more than one parent level is used.

7 years agoFix T35552: LibLoading objects with Collision sensors gives an error
Mitchell Stokes [Fri, 2 May 2014 07:08:00 +0000 (00:08 -0700)]
Fix T35552: LibLoading objects with Collision sensors gives an error

The collision sensors were not being properly unregistered from the
physics system before they were merged into the current scene.

7 years agoBGE cleanup: Removing the unused SCA_EventManager::Replace_PhysicsScene().
Mitchell Stokes [Fri, 2 May 2014 02:42:22 +0000 (19:42 -0700)]
BGE cleanup: Removing the unused SCA_EventManager::Replace_PhysicsScene().

7 years agoBGE: Forgot a NULL check in CcdPhysicsEnvironment::MergeEnvironment()
Mitchell Stokes [Fri, 2 May 2014 01:34:10 +0000 (18:34 -0700)]
BGE: Forgot a NULL check in CcdPhysicsEnvironment::MergeEnvironment()

7 years agoCorrect own stupid mistake dragging popups (x/y swap)
Campbell Barton [Fri, 2 May 2014 00:08:59 +0000 (10:08 +1000)]
Correct own stupid mistake dragging popups (x/y swap)

7 years agoCode cleanup: UI use ui_block_to_window_rctf where possible
Campbell Barton [Thu, 1 May 2014 23:31:48 +0000 (09:31 +1000)]
Code cleanup: UI use ui_block_to_window_rctf where possible

7 years agoCleanup: Remove unused variables.
Thomas Dinges [Thu, 1 May 2014 23:26:13 +0000 (01:26 +0200)]
Cleanup: Remove unused variables.

7 years agoUIL: Dragging popups wasn't updating safe-areas
Campbell Barton [Thu, 1 May 2014 23:23:53 +0000 (09:23 +1000)]
UIL: Dragging popups wasn't updating safe-areas

7 years agoBGE cleanup: Moving the PHY_* includes in BL_BlenderDataConversion.cpp
Mitchell Stokes [Thu, 1 May 2014 22:24:50 +0000 (15:24 -0700)]
BGE cleanup: Moving the PHY_* includes in BL_BlenderDataConversion.cpp

These includes are now with the rest of the includes instead of in the
middle of the file. This should also help building on OS X.

7 years agoCycles UI:
Pablo Vazquez [Thu, 1 May 2014 22:14:10 +0000 (19:14 -0300)]
Cycles UI:
Show the Ray Visibility panel for objects with dupli_group on, no reason to hide it.

7 years agoFix T39932: LibNew can't find LibLoaded meshes.
Mitchell Stokes [Thu, 1 May 2014 21:49:42 +0000 (14:49 -0700)]
Fix T39932: LibNew can't find LibLoaded meshes.

LibNew now searchs dynamic (i.e., LibLoaded)  mains instead of just the current main.

7 years agoUpdate parse_syntax_error() to Python 3.4x version
Campbell Barton [Thu, 1 May 2014 20:24:29 +0000 (06:24 +1000)]
Update parse_syntax_error() to Python 3.4x version

7 years agoFix T39988: Selected object count invalid after exiting local-view
Campbell Barton [Thu, 1 May 2014 19:56:57 +0000 (05:56 +1000)]
Fix T39988: Selected object count invalid after exiting local-view

7 years agoCode cleanup: remove file handling headers where they arent needed
Campbell Barton [Thu, 1 May 2014 19:36:21 +0000 (05:36 +1000)]
Code cleanup: remove file handling headers where they arent needed

7 years agoCode cleanup: replace long long with int64_t & doxy formatting.
Campbell Barton [Thu, 1 May 2014 19:34:31 +0000 (05:34 +1000)]
Code cleanup: replace long long with int64_t & doxy formatting.

7 years agoFix T39987: The new "redirect to bone constraints" button at the object constaints...
Bastien Montagne [Thu, 1 May 2014 19:23:12 +0000 (21:23 +0200)]
Fix T39987: The new "redirect to bone constraints" button at the object constaints tab is wrong in bone edit mode

In edit mode, do as with usual objects - show object constraints!

7 years agoCycles: MIS for lamps now loops over all lamps instead of picking one.
Brecht Van Lommel [Thu, 1 May 2014 17:18:42 +0000 (19:18 +0200)]
Cycles: MIS for lamps now loops over all lamps instead of picking one.

Probably will not be noticed in most scenes. This helps reduce noise when you
have multiple lamps with MIS enabled, at the cost of some performance, but from
testing some scenes this seems better.

7 years agoAdd BLI_compiler_compat.h to help with portability
Campbell Barton [Thu, 1 May 2014 15:14:15 +0000 (01:14 +1000)]
Add BLI_compiler_compat.h to help with portability

7 years agoCode cleanup: remove unused kludge for Py/Win encoding
Campbell Barton [Thu, 1 May 2014 14:56:24 +0000 (00:56 +1000)]
Code cleanup: remove unused kludge for Py/Win encoding

7 years agoCode cleanup: remove defines no longer needed on windows
Campbell Barton [Thu, 1 May 2014 14:54:42 +0000 (00:54 +1000)]
Code cleanup: remove defines no longer needed on windows

7 years agoCleanup: Remove unused variables.
Bastien Montagne [Thu, 1 May 2014 14:32:25 +0000 (16:32 +0200)]
Cleanup: Remove unused variables.

7 years agoFix some dummy formating issue (breacks i18n message processing).
Bastien Montagne [Thu, 1 May 2014 14:30:40 +0000 (16:30 +0200)]
Fix some dummy formating issue (breacks i18n message processing).

7 years agoFix T31555: Username with special chars in Windows 7
Bastien Montagne [Thu, 1 May 2014 14:22:30 +0000 (16:22 +0200)]
Fix T31555: Username with special chars in Windows 7

At last! Could not check seriously on windows (though it was done during py patch

7 years do not use terminfo in our own llvm build.
Bastien Montagne [Thu, 1 May 2014 12:20:40 +0000 (14:20 +0200)] do not use terminfo in our own llvm build.

llvm-config does not report it as link arg as it should

7 years agoFix for a typo in comment.
Tamito Kajiyama [Thu, 1 May 2014 13:57:02 +0000 (22:57 +0900)]
Fix for a typo in comment.

7 years agofix T39967: Added support for Import/export of vertex color layers
gaiaclary [Thu, 1 May 2014 12:52:10 +0000 (14:52 +0200)]
fix T39967: Added support for Import/export of vertex color layers

7 years agoFix blenderplayer build.
Bastien Montagne [Thu, 1 May 2014 07:35:32 +0000 (09:35 +0200)]
Fix blenderplayer build.

7 years agoFix T39938: fails when compiling OSL
Bastien Montagne [Thu, 1 May 2014 07:25:29 +0000 (09:25 +0200)]
Fix T39938: fails when compiling OSL

Should always use a fixed rev in git repos!

Also done some other cleanup/fixes.