blender.git
7 years agoMerging r47572 through r47580 form trunk into soc-2011-tomato
Sergey Sharybin [Thu, 7 Jun 2012 18:08:57 +0000 (18:08 +0000)]
Merging r47572 through r47580 form trunk into soc-2011-tomato

7 years agoRemove unused ibuf argument from draw_gpencil_2dimage
Sergey Sharybin [Thu, 7 Jun 2012 17:57:49 +0000 (17:57 +0000)]
Remove unused ibuf argument from draw_gpencil_2dimage

It was used by sequencer only and it wasn't ported for a while already.
This change allows to save cahce lookup for image and clip editors.

7 years ago[#31739] Collada: New Export selections 'Include Armatures'
Gaia Clary [Thu, 7 Jun 2012 17:55:26 +0000 (17:55 +0000)]
[#31739] Collada: New Export selections 'Include Armatures'

7 years agoRemove checks for valid frame from poll function in clip editor space
Sergey Sharybin [Thu, 7 Jun 2012 16:36:19 +0000 (16:36 +0000)]
Remove checks for valid frame from poll function in clip editor space

This results in some buttons not disabled when there's no currently displaying frame,
but this saves lots of cache lookups and threading loks for every frame update.

7 years agoAvoid imbuf loading when getting movie clip size
Sergey Sharybin [Thu, 7 Jun 2012 16:15:24 +0000 (16:15 +0000)]
Avoid imbuf loading when getting movie clip size

This prevents high memory usage by non-proxied frames when doing mask parenting.

Description from code:

  Originally was needed to support image sequences with different image dimensions,
  which might be useful for such things as reconstruction of unordered image sequence,
  or painting/rotoscoping of non-equal-sized images, but this ended up in unneeded
  cache lookups and even unwanted non-proxied files loading when doing mask parenting,
  so let's disable this for now and assume image sequence consists of images with equal sizes

7 years agocode cleanup: rename sequencer types to SEQ_TYPE_*** and use enums rather then defines.
Campbell Barton [Thu, 7 Jun 2012 15:49:02 +0000 (15:49 +0000)]
code cleanup: rename sequencer types to SEQ_TYPE_*** and use enums rather then defines.

7 years agoadding mask points now adds in the correct place relative to shape keys (updating...
Campbell Barton [Thu, 7 Jun 2012 15:33:32 +0000 (15:33 +0000)]
adding mask points now adds in the correct place relative to shape keys (updating other keys for the new points still needs work though)

7 years agofix for crash with recent color commits to draw-object, this case wasnt handled corre...
Campbell Barton [Thu, 7 Jun 2012 15:20:51 +0000 (15:20 +0000)]
fix for crash with recent color commits to draw-object, this case wasnt handled correctly before.

7 years agosvn merge ^/trunk/blender -r47566:47571
Campbell Barton [Thu, 7 Jun 2012 14:22:40 +0000 (14:22 +0000)]
svn merge ^/trunk/blender -r47566:47571

7 years agofix for crash with selecting camera bundles.
Campbell Barton [Thu, 7 Jun 2012 14:21:25 +0000 (14:21 +0000)]
fix for crash with selecting camera bundles.

7 years agoBugfix [#31723] Renderer (internal) ignores keyframes on 'Compositing' checkbox
Joshua Leung [Thu, 7 Jun 2012 10:55:53 +0000 (10:55 +0000)]
Bugfix [#31723] Renderer (internal) ignores keyframes on 'Compositing' checkbox
for animations

Pipeline options such as Use Compositing and Use Sequencer cannot be animated
due to the way that they are implemented now, so adding these to the list of
render properties that we cannot animate.

7 years agoMerging r47535 through r47566 from trunk into soc-2011-tomato
Sergey Sharybin [Thu, 7 Jun 2012 09:32:39 +0000 (09:32 +0000)]
Merging r47535 through r47566 from trunk into soc-2011-tomato

7 years agoFix #31725: UV map order is ignored when opening in 2.6+ versions
Sergey Sharybin [Thu, 7 Jun 2012 09:11:16 +0000 (09:11 +0000)]
Fix #31725: UV map order is ignored when opening in 2.6+ versions

Issue was caused by do_versions being used pdata as reference for active/render/
stencil/clone layer indices instead of fdata.

Added some utility functions used only by do_versions to be sure this indices
are set from fdata for pre-bmesh files.

7 years agofix for buffer overrun on windows by kjym3 on IRC.
Campbell Barton [Thu, 7 Jun 2012 09:05:51 +0000 (09:05 +0000)]
fix for buffer overrun on windows by kjym3 on IRC.

7 years agofix for armature specular material color overriding the wire color when instanced...
Campbell Barton [Thu, 7 Jun 2012 09:04:45 +0000 (09:04 +0000)]
fix for armature specular material color overriding the wire color when instanced in a dupli

7 years agodont draw bone names/axis inside duplicators
Campbell Barton [Thu, 7 Jun 2012 08:20:10 +0000 (08:20 +0000)]
dont draw bone names/axis inside duplicators

7 years agoFix [#31430] part 2: crash in iTaSC when end effector is a fixed bone. This situation...
Benoit Bolsee [Thu, 7 Jun 2012 08:16:41 +0000 (08:16 +0000)]
Fix [#31430] part 2: crash in iTaSC when end effector is a fixed bone. This situation was causing access to invalid index in the joint angle array although the end effector doesn't need any joint angle to compute its pause. Fixed this by changing the internal API of joint array: return pointer instead of reference so that NULL pointer can be returned instead of crashing when the index is invalid.

7 years agoFix unaligned array crash in Eigen3 because of compilation option. The EIGEN_DONT_ALI...
Benoit Bolsee [Thu, 7 Jun 2012 08:04:58 +0000 (08:04 +0000)]
Fix unaligned array crash in Eigen3 because of compilation option. The EIGEN_DONT_ALIGN_STATICALLY compilation option was added for Win32 only in revision 41283 because of some compilation problem. But this option is causing alignment problem for Eigen3 local variables when SSE optimization is enabled. I do not have any compilation problem when the option is not defined, so I just remove it as it should.

7 years agofix for error in previous commit.
Campbell Barton [Thu, 7 Jun 2012 08:02:48 +0000 (08:02 +0000)]
fix for error in previous commit.
- dupli-group armatures with pose bone objects set would draw with uninitialized color
- also fix old bug - armature were over-riding the constcolor option - so drawing dupli-groups for eg - would ignore the DRAW_CONSTCOLOR flag.

7 years agoFix #31734: Edge slide operator Flip/Even options not working
Sergey Sharybin [Thu, 7 Jun 2012 07:39:37 +0000 (07:39 +0000)]
Fix #31734: Edge slide operator Flip/Even options not working

Issue was caused by wrong check whether transform is in edge slide mode.

7 years agoimprovement to handle recalculation, only do this on auto-handles when they are in...
Campbell Barton [Thu, 7 Jun 2012 07:28:55 +0000 (07:28 +0000)]
improvement to handle recalculation, only do this on auto-handles when they are in a spline.

7 years agoCode cleanup - Shuffled solve_parenting() function around to remove need for
Joshua Leung [Thu, 7 Jun 2012 05:39:28 +0000 (05:39 +0000)]
Code cleanup - Shuffled solve_parenting() function around to remove need for
forward def/local prototype

7 years agoBugfix [#31735] Performance issue related to object parenting to armature
Joshua Leung [Thu, 7 Jun 2012 05:29:10 +0000 (05:29 +0000)]
Bugfix [#31735] Performance issue related to object parenting to armature

In the file included with the bugreport, framerates were dropping from 60fps to
11fps for an armature with several lattices parented, and a 5fps drop everytime
an object was parented to the armature.

Upon (re-)inspection of the code, it became apparent that this was being caused
by a block of code that would recalculate the parent (perhaps recursively) as it
thought the parent state was for the wrong timestamp. However, the timestamps
this was using was never really updated (except for a single place, which set it
to a single fixed value to force recalculations to take place), which meant that
this branch was run all the time. AFACT, this is a remnant from some of the old
timeoffset stuff + pre-Depsgraph timestamping hacks that are no longer used/set.

7 years agoSome slight refactoring of the BGE's LibLoad code to make things a bit cleaner (no...
Mitchell Stokes [Thu, 7 Jun 2012 01:46:28 +0000 (01:46 +0000)]
Some slight refactoring of the BGE's LibLoad code to make things a bit cleaner (no functional changes).

7 years agoFixing some potential heap corruption issues in the Blenderplayer when it is built...
Mitchell Stokes [Thu, 7 Jun 2012 01:44:22 +0000 (01:44 +0000)]
Fixing some potential heap corruption issues in the Blenderplayer when it is built with CMake. This fix forces Blender and the Blenderplayer to use the same SDNA, since inconsistencies between Blender's and the Blenderplayer's SDNA is what lead to the corruption issues.

7 years agoCycles: border render now works in the viewport, when looking through the
Brecht Van Lommel [Wed, 6 Jun 2012 23:27:43 +0000 (23:27 +0000)]
Cycles: border render now works in the viewport, when looking through the
camera, same as in render. It draws objects in solid draw mode outside of
the border.

7 years agoCycles: small code fix for disabled code.
Brecht Van Lommel [Wed, 6 Jun 2012 23:27:38 +0000 (23:27 +0000)]
Cycles: small code fix for disabled code.

7 years agoRevert my own commit r47544, this does not seem to be the correct fix. :/
Thomas Dinges [Wed, 6 Jun 2012 23:01:42 +0000 (23:01 +0000)]
Revert my own commit r47544, this does not seem to be the correct fix. :/

7 years agostyle cleanup
Campbell Barton [Wed, 6 Jun 2012 22:38:39 +0000 (22:38 +0000)]
style cleanup

7 years agoCycles / OSL:
Thomas Dinges [Wed, 6 Jun 2012 22:36:07 +0000 (22:36 +0000)]
Cycles / OSL:
* Missing header kernel_passes.h, needed for "direction_to_panorama" in kernel_triangle.h

7 years agoCmake:
Thomas Dinges [Wed, 6 Jun 2012 21:55:55 +0000 (21:55 +0000)]
Cmake:
* Removed first line, probably accidentally committed in r47439.

7 years agofix for bug where auto-handles were not calculated correctly for animated curves.
Campbell Barton [Wed, 6 Jun 2012 20:26:26 +0000 (20:26 +0000)]
fix for bug where auto-handles were not calculated correctly for animated curves.

7 years agocode cleanup: remove unused mask args
Campbell Barton [Wed, 6 Jun 2012 20:05:58 +0000 (20:05 +0000)]
code cleanup: remove unused mask args

7 years agodisable group/object selection in the outliner, it slows down drawing far too much.
Campbell Barton [Wed, 6 Jun 2012 19:36:26 +0000 (19:36 +0000)]
disable group/object selection in the outliner, it slows down drawing far too much.

7 years agogroup outliner option to instance selected groups in the scene.
Campbell Barton [Wed, 6 Jun 2012 19:20:39 +0000 (19:20 +0000)]
group outliner option to instance selected groups in the scene.

7 years agoMerging r47507 through r47534 from trunk into soc-2011-tomato
Sergey Sharybin [Wed, 6 Jun 2012 19:11:06 +0000 (19:11 +0000)]
Merging r47507 through r47534 from trunk into soc-2011-tomato

7 years agoChanged semantic of recently added start_frame
Sergey Sharybin [Wed, 6 Jun 2012 18:58:30 +0000 (18:58 +0000)]
Changed semantic of recently added start_frame

Now it's indicates at which scene frame number movie clip starts playing back.
This this setting is still belongs to clip datavlock and used by all users of
clip such as movie compositor nodes, constraints and so.

After long discussion and thoughts about this it was decided that this would
match image's current behavior (which initially seen a bit crappy), but that's
actually allows:

- Keep semantics of start frame in image and clip datablocks in sync
- Allows to support features like support of loading image sequences
  with crappy numbers in suffix which doesn't fit long int.
- Allows to eliminate extra boolean checkbox to control such kind of offset.

Hopefully from pipeline POV it wouldn't hurt because idea of having this things
implemented in original way was  working only if sequence before processing
started naming form 001.

7 years agoreplace glGetFloatv(GL_CURRENT_COLOR, col_f); with the current wire color arg.
Campbell Barton [Wed, 6 Jun 2012 18:38:01 +0000 (18:38 +0000)]
replace glGetFloatv(GL_CURRENT_COLOR, col_f); with the current wire color arg.

7 years agoTransform Locks UI:
Thomas Dinges [Wed, 6 Jun 2012 18:11:12 +0000 (18:11 +0000)]
Transform Locks UI:
* Some beautifying and cleanup to show X, Y, Z label.

This fixes [#31717] Transform Locks panel -> no x,y,z coordinates are displayed

7 years agopass the object wire color along to drawing functions, too many places would use...
Campbell Barton [Wed, 6 Jun 2012 18:00:08 +0000 (18:00 +0000)]
pass the object wire color along to drawing functions, too many places would use glGetFloatv(GL_CURRENT_COLOR, curcol), which also become confusing to debug if in some cases the color was set beforehand.

7 years agoCycles / OSL:
Thomas Dinges [Wed, 6 Jun 2012 16:00:21 +0000 (16:00 +0000)]
Cycles / OSL:
* Fixes for some silly typos in the checker shader.
* Added missing GPL licence block to node_fresnel.h.

7 years agostyle cleanup: (indentation)
Campbell Barton [Wed, 6 Jun 2012 14:48:39 +0000 (14:48 +0000)]
style cleanup: (indentation)

7 years agomask mode
Campbell Barton [Wed, 6 Jun 2012 14:38:47 +0000 (14:38 +0000)]
mask mode
- only keyframe selected mask layers
- fix for crash in deleting animated mask layers (other than the first)

7 years agoCloth: Add support for "Self Collision Vertex Group".
Daniel Genrich [Wed, 6 Jun 2012 13:30:05 +0000 (13:30 +0000)]
Cloth: Add support for "Self Collision Vertex Group".

Self collision vertex groups enable artists to exclude selected vertices from getting involved in self collisions. This speeds simulations and it also resolves some self collision issues.

7 years agorecalc animated mask deformations on load.
Campbell Barton [Wed, 6 Jun 2012 12:48:02 +0000 (12:48 +0000)]
recalc animated mask deformations on load.

7 years ago- background images now draw in opengl render
Campbell Barton [Wed, 6 Jun 2012 11:40:01 +0000 (11:40 +0000)]
- background images now draw in opengl render
- fix bug where forground images could be invisible when clipping was enabled.

7 years agoFix scons + smoke not working. it seems like the definition + include file are needed...
Antony Riakiotakis [Wed, 6 Jun 2012 10:41:49 +0000 (10:41 +0000)]
Fix scons + smoke not working. it seems like the definition + include file are needed on the higher level dir too.

7 years agosvn merge ^/trunk/blender -r47423:47506
Campbell Barton [Wed, 6 Jun 2012 10:25:59 +0000 (10:25 +0000)]
svn merge ^/trunk/blender -r47423:47506

7 years agoAdded example of basic objects ooperations in Python, liek adding object
Sergey Sharybin [Wed, 6 Jun 2012 10:01:17 +0000 (10:01 +0000)]
Added example of basic objects ooperations in Python, liek adding object
datablock, adding object, linking it to scene and making selected and active.

7 years agoAdding back Dutch language, as it seems we found a translator for it. :)
Bastien Montagne [Wed, 6 Jun 2012 08:33:57 +0000 (08:33 +0000)]
Adding back Dutch language, as it seems we found a translator for it. :)

7 years agoCorrected documentation for intersect_point_quad_2d to match exactly how
Sergey Sharybin [Wed, 6 Jun 2012 08:08:54 +0000 (08:08 +0000)]
Corrected documentation for intersect_point_quad_2d to match exactly how
it works in C side: only convex quads without singularities gives predictable
results.

7 years agosupport negative indexing with SequenceElements.pop() - like python does, -1 is default.
Campbell Barton [Wed, 6 Jun 2012 06:01:51 +0000 (06:01 +0000)]
support negative indexing with SequenceElements.pop() - like python does, -1 is default.

7 years agofix for building without smoke.
Campbell Barton [Wed, 6 Jun 2012 05:37:38 +0000 (05:37 +0000)]
fix for building without smoke.

7 years agoEnabling smooth modifier for curves
Daniel Salazar [Wed, 6 Jun 2012 00:03:39 +0000 (00:03 +0000)]
Enabling smooth modifier for curves

7 years agoSmoke: Fix rna names as suggested by Thomas Dinges.
Daniel Genrich [Tue, 5 Jun 2012 22:50:02 +0000 (22:50 +0000)]
Smoke: Fix rna names as suggested by Thomas Dinges.

7 years agoSmoke: Make Smoke density available to python via rna.
Daniel Genrich [Tue, 5 Jun 2012 22:43:29 +0000 (22:43 +0000)]
Smoke: Make Smoke density available to python via rna.

7 years agostyle cleanup
Campbell Barton [Tue, 5 Jun 2012 22:12:17 +0000 (22:12 +0000)]
style cleanup

7 years agostyle cleanup
Campbell Barton [Tue, 5 Jun 2012 21:54:21 +0000 (21:54 +0000)]
style cleanup

7 years agooperator to reset feather weights on all shape keys
Campbell Barton [Tue, 5 Jun 2012 19:39:12 +0000 (19:39 +0000)]
operator to reset feather weights on all shape keys

7 years agoedge split modifier now works more like pre-bmesh --- 3+ faces using an edge always...
Campbell Barton [Tue, 5 Jun 2012 19:24:01 +0000 (19:24 +0000)]
edge split modifier now works more like pre-bmesh --- 3+ faces using an edge always split.

7 years agoEnable cuda sm_30 kernels for buildbot
Sergey Sharybin [Tue, 5 Jun 2012 19:23:52 +0000 (19:23 +0000)]
Enable cuda sm_30 kernels for buildbot

7 years agoConfigurable start frame for movie clip datablocks as alternative to automatic start...
Sergey Sharybin [Tue, 5 Jun 2012 18:38:09 +0000 (18:38 +0000)]
Configurable start frame for movie clip datablocks as alternative to automatic start frame number

Number of start frame in opened image sequence used to be distinguished automatically
in a way that file name used on open would be displayed at scene frame #1.

But sometimes it's useful to have it manually configurable (like in cases when you're
processing image sequence and replacing clip's filepath to postprocessed image sequence
and want new clip to show at the same frame range as it was rendered from).

Added Custom Start Frame flag to movie clip (could be accessed from Footage panel in
clip editor) and Start Frame which means number of frame from sequence which would
be displayed at scene frame #1.

For example if you've got clip pointing to file render_00100.png and Start Frame of 100
this file would be displayed at scene frame #1, if Start Frame is 1 then this image
would be displayed at scene frame #100,

7 years agoCycles / OSL:
Thomas Dinges [Tue, 5 Jun 2012 15:40:02 +0000 (15:40 +0000)]
Cycles / OSL:
* Fixes for r46114, object_fetch_transform missed time argument.
* Syntax fixes for Checker texture.

7 years agoshrink/fatten now works with proportional editmode on curves.
Campbell Barton [Tue, 5 Jun 2012 14:19:13 +0000 (14:19 +0000)]
shrink/fatten now works with proportional editmode on curves.

7 years agoshrink/fatten transform for mask - adjusts the feather weight.
Campbell Barton [Tue, 5 Jun 2012 14:13:14 +0000 (14:13 +0000)]
shrink/fatten transform for mask - adjusts the feather weight.
works in proportional editmode too.

7 years agomask point slide now accounts for scaled bezier weights,
Campbell Barton [Tue, 5 Jun 2012 12:51:11 +0000 (12:51 +0000)]
mask point slide now accounts for scaled bezier weights,

7 years agochange how the weight for feather points are calculated with masking, instead of...
Campbell Barton [Tue, 5 Jun 2012 12:22:02 +0000 (12:22 +0000)]
change how the weight for feather points are calculated with masking, instead of using absolute weights, multiply by by the weights of the adjacent beziers.

without this - there was no way to animate the overall feather influence of the feather.

will update tools to account for this next.

7 years agocode cleanup: mask feather weight - add in checks for u==1 or u==0
Campbell Barton [Tue, 5 Jun 2012 12:09:24 +0000 (12:09 +0000)]
code cleanup: mask feather weight - add in checks for u==1 or u==0

7 years agocode cleanup: helper functions for masking.
Campbell Barton [Tue, 5 Jun 2012 11:46:55 +0000 (11:46 +0000)]
code cleanup: helper functions for masking.

7 years agocode cleanup: var names in mask code
Campbell Barton [Tue, 5 Jun 2012 11:28:54 +0000 (11:28 +0000)]
code cleanup: var names in mask code

7 years agoFix #31713: Mask editor: RMB drag crashes Blender
Sergey Sharybin [Tue, 5 Jun 2012 11:28:15 +0000 (11:28 +0000)]
Fix #31713: Mask editor: RMB drag crashes Blender

Simple missed NULL check in TransData creation.

7 years agoFix #31702: Drag and Drop parenting crashes Blender
Sergey Sharybin [Tue, 5 Jun 2012 09:57:19 +0000 (09:57 +0000)]
Fix #31702: Drag and Drop parenting crashes Blender

Crash was caused by recent changes in parent drop operator which were
aimed to prevent parenting objects between different scenes (which probably
makes sense).

The problem was how it was checked if objects belongs to the same scene --
outliner tree with type ID_SCE was used for this which works pretty nice
for All Scenes outliner view. But in other view modes there is no scene
element in outliner tree which lead to some NULL pointer dereferences.

Currently resolved this by assuming that if there's no Scene parent element
in outliner tree parent and child belongs to the same scene which is active
scene. This is truth for current view modes of outliner but if it'll be
changed in the future this assumption shall be updated and re-implemented
with some smarter checks of which scene object from outliner belongs to.

7 years agomask editing
Campbell Barton [Tue, 5 Jun 2012 09:37:44 +0000 (09:37 +0000)]
mask editing
- clear feather weights (alt+s)
- fix for glitch where placing the feather would jitter.

7 years agoCycles / OSL:
Thomas Dinges [Tue, 5 Jun 2012 09:29:47 +0000 (09:29 +0000)]
Cycles / OSL:
* Remove oslexec_pvt.h header and some typo fixes.
* This file needs deeper updates for changes done in OSL 0.6.0, see
https://github.com/imageworks/OpenShadingLanguage/commit/11ce51418b45e975ace4d919a4bdd8c2001ba300

7 years agoFix #31593: Every time I switch between edit and object mode, it crashes
Sergey Sharybin [Tue, 5 Jun 2012 08:41:53 +0000 (08:41 +0000)]
Fix #31593: Every time I switch between edit and object mode, it crashes

Crash was caused by incorrect restoring OpenGL context due to some
weird bit operations used to indicate whether stuff like color arrays
is initialized resulting in some unpredictable results on different
platforms and drivers.

7 years agoFix #31706, Crash loading old file in trunk build.
Lukas Toenne [Tue, 5 Jun 2012 08:06:15 +0000 (08:06 +0000)]
Fix #31706, Crash loading old file in trunk build.

7 years agomask switch direction now swaps handle direction too
Campbell Barton [Tue, 5 Jun 2012 07:01:43 +0000 (07:01 +0000)]
mask switch direction now swaps handle direction too

7 years agofix for possible uninitialized pointer use in mask rasterize and remove some dead...
Campbell Barton [Tue, 5 Jun 2012 06:54:18 +0000 (06:54 +0000)]
fix for possible uninitialized pointer use in mask rasterize and remove some dead code.

7 years agocorrection to own change with cmake, oiio linking.
Campbell Barton [Tue, 5 Jun 2012 06:18:31 +0000 (06:18 +0000)]
correction to own change with cmake, oiio linking.

7 years agoFix remesh output changing when input is moved relative to origin.
Nicholas Bishop [Mon, 4 Jun 2012 23:53:59 +0000 (23:53 +0000)]
Fix remesh output changing when input is moved relative to origin.

Fixes bug [#31626] Remesh modifier generates different results
depending on object origin position

Was incorrectly initializing bounding box min/max to zero, now uses
INIT_MINMAX.

7 years agoFix NULL free warning in multires.
Nicholas Bishop [Mon, 4 Jun 2012 23:14:57 +0000 (23:14 +0000)]
Fix NULL free warning in multires.

7 years agostyle cleanup
Campbell Barton [Mon, 4 Jun 2012 22:44:58 +0000 (22:44 +0000)]
style cleanup

7 years agoonly use tiff/exr when enabled.
Campbell Barton [Mon, 4 Jun 2012 22:34:28 +0000 (22:34 +0000)]
only use tiff/exr when enabled.

7 years agoFix [#31544]: iTaSC assertion when creating armature with no joint. This degenerated...
Benoit Bolsee [Mon, 4 Jun 2012 22:29:17 +0000 (22:29 +0000)]
Fix [#31544]: iTaSC assertion when creating armature with no joint. This degenerated case can be obtained by having a single bone in the IK chain and locking all 3 axis. This case was causing an assert in the KDL library. The bug is fixed by simply not creating the IK scene in this case.

7 years agoCycles / OSL:
Thomas Dinges [Mon, 4 Jun 2012 20:50:59 +0000 (20:50 +0000)]
Cycles / OSL:
* Fixes for changes in the OSL register_closure() API.

7 years agostyle cleanup
Campbell Barton [Mon, 4 Jun 2012 20:11:09 +0000 (20:11 +0000)]
style cleanup

7 years agoCycles / OSL:
Thomas Dinges [Mon, 4 Jun 2012 19:53:50 +0000 (19:53 +0000)]
Cycles / OSL:
* Compile fixes, missing ShaderClosure argument for eval functions. (r40163)

7 years agoA few UI messages fixes.
Bastien Montagne [Mon, 4 Jun 2012 19:43:12 +0000 (19:43 +0000)]
A few UI messages fixes.

7 years agoCycles: support for image sequences in image/environment texture node.
Brecht Van Lommel [Mon, 4 Jun 2012 19:38:33 +0000 (19:38 +0000)]
Cycles: support for image sequences in image/environment texture node.

7 years agoCycles: fix spot lamp emitting light in two directions.
Brecht Van Lommel [Mon, 4 Jun 2012 19:38:10 +0000 (19:38 +0000)]
Cycles: fix spot lamp emitting light in two directions.

7 years agoCycles / OSL:
Thomas Dinges [Mon, 4 Jun 2012 19:00:13 +0000 (19:00 +0000)]
Cycles / OSL:
* __OSL__ is now defined for CPU when building with OSL.

* First batch of compile fixes, remove some unneeded std namespace declarations and added missing includes.

7 years ago * modified vieweroperation to not calculate based on the DO_NODE_OUTPUT
Jeroen Bakker [Mon, 4 Jun 2012 18:07:29 +0000 (18:07 +0000)]
 * modified vieweroperation to not calculate based on the DO_NODE_OUTPUT
flag of the editorbNode.

7 years agoabbreviate mask-editing to mask-edit
Campbell Barton [Mon, 4 Jun 2012 17:30:54 +0000 (17:30 +0000)]
abbreviate mask-editing to mask-edit

7 years agoinclude cleanup, also raskter wasn't building on osx
Campbell Barton [Mon, 4 Jun 2012 17:27:22 +0000 (17:27 +0000)]
include cleanup, also raskter wasn't building on osx

7 years agoCycles: spot lamp support.
Brecht Van Lommel [Mon, 4 Jun 2012 17:17:10 +0000 (17:17 +0000)]
Cycles: spot lamp support.

7 years agopicky change - rename keymap since there is no 'mask editor'
Campbell Barton [Mon, 4 Jun 2012 17:13:38 +0000 (17:13 +0000)]
picky change - rename keymap since there is no 'mask editor'

7 years agosvn merge ^/trunk/blender -r47413:47423
Campbell Barton [Mon, 4 Jun 2012 16:56:51 +0000 (16:56 +0000)]
svn merge ^/trunk/blender -r47413:47423

7 years agomask mode for clip editor developed by Sergey Sharybin, Pete Larabell and myself.
Campbell Barton [Mon, 4 Jun 2012 16:42:58 +0000 (16:42 +0000)]
mask mode for clip editor developed by Sergey Sharybin, Pete Larabell and myself.

see:
http://wiki.blender.org/index.php/User:Nazg-gul/MaskEditor

note - mask editing tools need continued development, feather option is not working 100%

7 years agoCycles / OSL:
Thomas Dinges [Mon, 4 Jun 2012 16:30:15 +0000 (16:30 +0000)]
Cycles / OSL:
* Compile option to build with OSL, disabled by default.

7 years agoAntoher fix for library linking issues, must change all entries in the libmap,
Brecht Van Lommel [Mon, 4 Jun 2012 16:10:20 +0000 (16:10 +0000)]
Antoher fix for library linking issues, must change all entries in the libmap,
not just the first one.