blender.git
7 years agosvn merge ^/trunk/blender -r55813:55815
Campbell Barton [Fri, 5 Apr 2013 16:27:39 +0000 (16:27 +0000)]
svn merge ^/trunk/blender -r55813:55815

7 years agocode cleanup: quiet some warnings and style
Campbell Barton [Fri, 5 Apr 2013 15:45:10 +0000 (15:45 +0000)]
code cleanup: quiet some warnings and style

7 years agosvn merge ^/trunk/blender -r55776:55813
Campbell Barton [Fri, 5 Apr 2013 15:42:31 +0000 (15:42 +0000)]
svn merge ^/trunk/blender -r55776:55813

7 years agofix [#34881] Bad characters in error output (PyConsole) if trying to use a Bmesh...
Campbell Barton [Fri, 5 Apr 2013 15:09:25 +0000 (15:09 +0000)]
fix [#34881] Bad characters in error output (PyConsole) if trying to use a Bmesh UV Layer on a BMVert

7 years agocode cleanup: use bool's for vgroup and editmode.
Campbell Barton [Fri, 5 Apr 2013 14:58:30 +0000 (14:58 +0000)]
code cleanup: use bool's for vgroup and editmode.

7 years agoMore fixes for install_deps.sh under ubuntu 10.04: git package is called "git-core...
Bastien Montagne [Fri, 5 Apr 2013 13:34:32 +0000 (13:34 +0000)]
More fixes for install_deps.sh under ubuntu 10.04: git package is called "git-core", and 'apt-cache policy' returns a different result than newer versions when no package is found, changed the "available deb package" test to use "apt-cache show" instead.

7 years agoStencil dimension control:
Antony Riakiotakis [Fri, 5 Apr 2013 13:00:16 +0000 (13:00 +0000)]
Stencil dimension control:

* Shift-Rclick and holding right click, x or y will trigger constrained
scaling of overlay. Pressing again will revert to uniform scaling.
* Added operator, visible under the mapping drop menu, to fit stencil
aspect ratio to brush image aspect ratio.
* Made it possible to access stencil attributes from python as vec.x,
vec.y. Thanks to kgeogeo for pointing out!

7 years agoFirst fix for install_deps and ubuntu 10.04 (no libtiff5, only libtiff4, wonder why...
Bastien Montagne [Fri, 5 Apr 2013 12:37:48 +0000 (12:37 +0000)]
First fix for install_deps and ubuntu 10.04 (no libtiff5, only libtiff4, wonder why this package does not work as jpeg or png ones)...

This allows compilation of OIIO, install_deps.sh still working though (on this old OS, all libs have to be compiled, takes time... :/).

7 years agoPatch from kgeogeo:
Antony Riakiotakis [Fri, 5 Apr 2013 11:45:33 +0000 (11:45 +0000)]
Patch from kgeogeo:

* Change coordinates of stencil to float, helps with precision during
property manuipulations
* Expose stencil properties to RNA.

7 years agoFix #34873, Custom min/max node values get reset randomly while working and on save...
Lukas Toenne [Fri, 5 Apr 2013 11:16:06 +0000 (11:16 +0000)]
Fix #34873, Custom min/max node values get reset randomly while working and on save and quit. Node group socket interface was not storing the default_value struct in writefile.c, forgot to add this back when returning to DNA data for node sockets.

7 years agoFixed typo in OCIO GLSL module, was using address to a pointer..
Sergey Sharybin [Fri, 5 Apr 2013 11:10:59 +0000 (11:10 +0000)]
Fixed typo in OCIO GLSL module, was using address to a pointer..

7 years agoFix for compositor bug found by Ton Roosendaal. Color Balance node was using wrong...
Lukas Toenne [Fri, 5 Apr 2013 11:02:32 +0000 (11:02 +0000)]
Fix for compositor bug found by Ton Roosendaal. Color Balance node was using wrong socket index to map the operation socket to the UI node socket.

7 years agoFix #34872: Every images are displayed as black in UV/image editor
Sergey Sharybin [Fri, 5 Apr 2013 11:01:35 +0000 (11:01 +0000)]
Fix #34872: Every images are displayed as black in UV/image editor

Issue was caused by some mesa drivers does not support GL_RGBA16F.

Now added check around glTexImage2D to verify whether requested
internal format is actually supported. If not blender will fall
back to non-GLSL image display.

7 years agoUpdate libmv to current upstream version
Sergey Sharybin [Fri, 5 Apr 2013 09:23:20 +0000 (09:23 +0000)]
Update libmv to current upstream version

- Solves some strict compilation warning
- Style/code cleanup

7 years agoBundle current master of ceres-solver
Sergey Sharybin [Fri, 5 Apr 2013 09:22:54 +0000 (09:22 +0000)]
Bundle current master of ceres-solver

Thins brings up some speed improvements:

SPARSE_SCHUR is approx 1.3-1.5x times faster
ITERATIVE_SCHUR is approx 1.2x times faster

For blender this means camera solution go a bit
faster now. Would not have affect on tracking
speed.

7 years agoFix [#34857]: Negative temp.diff. in a smoke simulation doesn't work.
Miika Hamalainen [Fri, 5 Apr 2013 07:56:59 +0000 (07:56 +0000)]
Fix [#34857]: Negative temp.diff. in a smoke simulation doesn't work.

7 years agoApparently, you shall not define variables in the middle of the block
Sergey Sharybin [Fri, 5 Apr 2013 06:50:59 +0000 (06:50 +0000)]
Apparently, you shall not define variables in the middle of the block

7 years agofix bad memmove size (reading past buffer bounds)
Campbell Barton [Fri, 5 Apr 2013 03:44:07 +0000 (03:44 +0000)]
fix bad memmove size (reading past buffer bounds)

7 years agoBGE: Cleaning up the VBO code to use RAS_TexVert more directly instead of copying...
Mitchell Stokes [Fri, 5 Apr 2013 01:28:38 +0000 (01:28 +0000)]
BGE: Cleaning up the VBO code to use RAS_TexVert more directly instead of copying out pieces. This also gets rid of MapBuffers, which isn't available in OpenGL ES. Scenes that require constant VBO updates (like my skeletal mesh stress test) are now 10~13% faster.

7 years agoFix #34862: some operators like mesh separate or object clear parent were not
Brecht Van Lommel [Fri, 5 Apr 2013 00:53:37 +0000 (00:53 +0000)]
Fix #34862: some operators like mesh separate or object clear parent were not
showing shortcuts in menus, now it shows them in the submenu.

7 years agoFix #34867: cycles viewport render did not respect viewport visibility for
Brecht Van Lommel [Fri, 5 Apr 2013 00:33:59 +0000 (00:33 +0000)]
Fix #34867: cycles viewport render did not respect viewport visibility for
modifiers with text/curve/surface objects.

This is because the code here did not yet support the distinction between
generating the tesselated mesh at viewport/render resolution and generating a
separate displist/derivedmesh for render that is not stored in the object but
created and freed on the fly.

7 years agopy api additions needed for fixing [#34864].
Campbell Barton [Fri, 5 Apr 2013 00:30:32 +0000 (00:30 +0000)]
py api additions needed for fixing [#34864].
- add rna property 'as_bytes' method so you can get a string property as python bytes (bypass encoding).
- make bpy.path.abspath/relpath compatible with bytes.
- add 'relpath' option to bpy_extras.image_utils.load_image(), so you can load an image relative to a path.

7 years agocorrection to previous warning cleanup, also quiet shadow-warning for thumbnail ...
Campbell Barton [Fri, 5 Apr 2013 00:10:33 +0000 (00:10 +0000)]
correction to previous warning cleanup, also quiet shadow-warning for thumbnail `size`

7 years agoAttempt to fix #34871: random CUDA 3.5 compile failure due to recent change.
Brecht Van Lommel [Thu, 4 Apr 2013 23:52:33 +0000 (23:52 +0000)]
Attempt to fix #34871: random CUDA 3.5 compile failure due to recent change.

7 years agoFix #34601: cycles OSL crash when using preview render and viewport render at
Brecht Van Lommel [Thu, 4 Apr 2013 23:48:07 +0000 (23:48 +0000)]
Fix #34601: cycles OSL crash when using preview render and viewport render at
the same time, due to shared texture cache system.

7 years agocode cleanup: bge warnings
Campbell Barton [Thu, 4 Apr 2013 23:16:23 +0000 (23:16 +0000)]
code cleanup: bge warnings

7 years agoskip unneeded calculations when calling calculateTransformCenter()
Campbell Barton [Thu, 4 Apr 2013 21:40:39 +0000 (21:40 +0000)]
skip unneeded calculations when calling calculateTransformCenter()
which gets called whenever the view is rotated when rotate-around-selected preference is enabled.

7 years agoFix for 34703 Mix node (Hue, Saturation) update and rendering error
Jeroen Bakker [Thu, 4 Apr 2013 19:53:30 +0000 (19:53 +0000)]
Fix for 34703 Mix node (Hue, Saturation) update and rendering error
Fix for 34494 Blender 2.65 regression test error - compo_map_uv_cubes.blend - stripe/artifact between cubes

Hue and saturation node has an early break when saturarion is 0. When this happened the input 1 color needed to be used. This behaviour was not merged.

When no FSAA is used in the ZCombine. a mask will be created, this mask will be antialiased and based on this mask the colors between the two images are blended. This was also behaviour that was not merged correctly. Now it is back making much better z-combines.

Hope nobody uses these gabs as a work around.

 - At Mind -
Jeroen & Monique

7 years agopy api, bmesh
Campbell Barton [Thu, 4 Apr 2013 18:22:01 +0000 (18:22 +0000)]
py api, bmesh
- add BMEdge.calc_face_angle_signed() which gives a negative angle for for concave edges.
- add BMEdge.is_convex

7 years agocode cleanup: py ui
Campbell Barton [Thu, 4 Apr 2013 17:01:51 +0000 (17:01 +0000)]
code cleanup: py ui

7 years agoRelease Logs:
Thomas Dinges [Thu, 4 Apr 2013 16:23:00 +0000 (16:23 +0000)]
Release Logs:
* Readme and release links for upcoming Blender 2.67.

7 years agoJump to start/end of tracked segment works in Mask editing mode now.
Sergey Sharybin [Thu, 4 Apr 2013 16:05:02 +0000 (16:05 +0000)]
Jump to start/end of tracked segment works in Mask editing mode now.

7 years agocode cleanup: use bools in interface handlers, dont show translation menu when right...
Campbell Barton [Thu, 4 Apr 2013 15:16:29 +0000 (15:16 +0000)]
code cleanup: use bools in interface handlers, dont show translation menu when right clicking on splash, use less confusing args for copy/paste function.

7 years agoTwo small fixes:
Ton Roosendaal [Thu, 4 Apr 2013 15:10:52 +0000 (15:10 +0000)]
Two small fixes:

- "Add node" was showing on wrong location when used via pulldown menus.
  Now this option will put the nodes in center of the view.

- The Curves widget was making itself smaller/bigger based on width of region.
  That messes up the layout engine now - especially the code that checks if
  there's a scroller needed or not (it went into an eternal feedback loop).

  Now this widget has fixed height (like the other larger widgets).

  Better would be to allow such large widgets to be scaled vertically individually.
  That's for the todo!

7 years agofix for referencing freed memory when rendering materials (could crash material preview).
Campbell Barton [Thu, 4 Apr 2013 14:07:10 +0000 (14:07 +0000)]
fix for referencing freed memory when rendering materials (could crash material preview).

7 years agoFix #34863: bge.render.makeScreenshot from Blender was only saving PNG files,
Brecht Van Lommel [Thu, 4 Apr 2013 14:00:31 +0000 (14:00 +0000)]
Fix #34863: bge.render.makeScreenshot from Blender was only saving PNG files,
while the docs said it followed the settings in the Output panel, other file
formats work now.

Benderplayer still only saves PNG now as documented, but I cleaned up the code
there to reuse existing imbuf functions rather than using own libpng code.

7 years agosvn merge ^/trunk/blender -r55700:55776
Campbell Barton [Thu, 4 Apr 2013 13:37:07 +0000 (13:37 +0000)]
svn merge ^/trunk/blender -r55700:55776

7 years agoRemove unused function.
Sergey Sharybin [Thu, 4 Apr 2013 12:26:31 +0000 (12:26 +0000)]
Remove unused function.

It was only used for movie clips prefetching, no need
in it nowadays.

7 years agoUse GLSL display for compositor backdrop and sequencer preview
Sergey Sharybin [Thu, 4 Apr 2013 12:20:13 +0000 (12:20 +0000)]
Use GLSL display for compositor backdrop and sequencer preview

Now only background images remained to be ported. Plus implement
GLSL for dithering and RGB curves.

7 years agoFix blenderplayer (missing stub...).
Bastien Montagne [Thu, 4 Apr 2013 12:12:33 +0000 (12:12 +0000)]
Fix blenderplayer (missing stub...).

7 years agoquiet warnings (building with -Werror)
Campbell Barton [Thu, 4 Apr 2013 11:47:48 +0000 (11:47 +0000)]
quiet warnings (building with -Werror)

7 years agometaballs were not scaling/rotating about their own centers when V3D_LOCAL was used.
Campbell Barton [Thu, 4 Apr 2013 09:59:06 +0000 (09:59 +0000)]
metaballs were not scaling/rotating about their own centers when V3D_LOCAL was used.

7 years agoChanges to cache invalidation policy for movie clips
Sergey Sharybin [Thu, 4 Apr 2013 09:50:51 +0000 (09:50 +0000)]
Changes to cache invalidation policy for movie clips

- When changing clip in clip editor, remove all frames
  from it's cache to free memory for new clip.

- When changing proxy render settings, free cache as well.

7 years agoClip editor prefetch changes
Sergey Sharybin [Thu, 4 Apr 2013 09:50:38 +0000 (09:50 +0000)]
Clip editor prefetch changes

Made it an operator instead of automatic prefetching.
Filling the whole memory with frames is not always
desired behavior.

Now prefetching is available via P-key, or from Clip
panel in toolbox or from Clip menu.

Also enabled prefetching for non-proxied movies.

7 years agofix [#34802] Individual Transformation Confusing in Edit Mode
Campbell Barton [Thu, 4 Apr 2013 09:20:46 +0000 (09:20 +0000)]
fix [#34802] Individual Transformation Confusing in Edit Mode

Individual transformation now works in editmode mesh faces/edge, armature bones and metaballs.

7 years agoimproved method of getting the tangent axis from a bmesh triangle,
Campbell Barton [Thu, 4 Apr 2013 08:47:07 +0000 (08:47 +0000)]
improved method of getting the tangent axis from a bmesh triangle,
rather then getting the longest edge, get the edge which which is most different from the 2 others ends up giving more useful results: for an isosceles triangle it returns the base weather its longer or shorter then the other sides.

7 years agofix [#34860] View in Weight Painting mode no longer rotates around active bone
Campbell Barton [Thu, 4 Apr 2013 04:26:13 +0000 (04:26 +0000)]
fix [#34860] View in Weight Painting mode no longer rotates around active bone

7 years agocode cleanup: use bools, (float)sin/(float)cos -> sinf/cosf, more meaningful var...
Campbell Barton [Thu, 4 Apr 2013 04:22:38 +0000 (04:22 +0000)]
code cleanup: use bools, (float)sin/(float)cos -> sinf/cosf, more meaningful var names.

7 years agoFix for [#34754] "Revision 55527 provokes glitchy GLSL shadow map rendering" reported...
Mitchell Stokes [Thu, 4 Apr 2013 03:55:43 +0000 (03:55 +0000)]
Fix for [#34754] "Revision 55527 provokes glitchy GLSL shadow map rendering" reported by Alain Ducharme. Per material uniforms and per object uniforms are now better separated.

7 years agocode cleanup: use bools in UI and WM code, quiet some shadow warnings, remove unused...
Campbell Barton [Thu, 4 Apr 2013 02:05:11 +0000 (02:05 +0000)]
code cleanup: use bools in UI and WM code, quiet some shadow warnings, remove unused function uiEmboss()

7 years agoFix #34625: duplivert/face rendering with modifier could crash accessing UV and
Brecht Van Lommel [Wed, 3 Apr 2013 20:10:08 +0000 (20:10 +0000)]
Fix #34625: duplivert/face rendering with modifier could crash accessing UV and
generated coordinates on the original mesh, after the change that made duplis
take modifiers into account.

7 years agoFix for Freestyle face marks not effective with the Mirror modifier.
Tamito Kajiyama [Wed, 3 Apr 2013 18:26:51 +0000 (18:26 +0000)]
Fix for Freestyle face marks not effective with the Mirror modifier.
Reported by IRIE Shinsuke through a branch code review comment, thanks!

7 years agoFix #34700: orthographic camera DOF was still not working correct.
Brecht Van Lommel [Wed, 3 Apr 2013 17:32:30 +0000 (17:32 +0000)]
Fix #34700: orthographic camera DOF was still not working correct.

7 years agoApparently zoom in clip editor was broken
Sergey Sharybin [Wed, 3 Apr 2013 16:21:14 +0000 (16:21 +0000)]
Apparently zoom in clip editor was broken

Also silenced some warnings in glutil.

7 years agoFix #34852: multilayer SSS material rendering different in progressive and
Brecht Van Lommel [Wed, 3 Apr 2013 16:12:13 +0000 (16:12 +0000)]
Fix #34852: multilayer SSS material rendering different in progressive and
non-progressive integrator.

7 years agoBunch of fixes for GLSL display transform
Sergey Sharybin [Wed, 3 Apr 2013 15:59:54 +0000 (15:59 +0000)]
Bunch of fixes for GLSL display transform

- GLSL shader wasn't aware of alpha predivide option,
  always assuming alpha is straight. Gave wrong results
  when displaying transparent float buffers.

- GLSL display wasn't aware of float buffers with number
  of channels different from 4, crashing when trying to
  display image with different number of channels.

  This required a bit larger changes, namely now it's
  possible to pass format (GL_RGB, GL_RGBAm GL_LUMINANCE)
  to glaDrawPixelsTex, This also implied adding format to
  glaDrawPixelsAuto and modifying all places where this
  functions are called.

  Now GLSL will handle both 3 and 4 channels buffers,
  single channel images are handled by CPU.

- Replaced hack for render result displaying with a bit
  different hack.

  Namely CPU conversion will happen only during render,
  once render is done GLSL would be used for displaying
  render result on a screen.

  This is so because of the way renderer updates parts
  of the image -- it happens without respect to active
  render layer in image user. This is harmless because
  only display buffer is modifying, but this is tricky
  because we don't have original buffer opened during
  rendering.

  One more related fix here was about when rendering
  multiple layers, wrong image would be displaying when
  rendering is done. Added a signal to invalidate
  display buffer once rendering is done (only happens
  when using multiple layers). This solves issue with
  wrong buffer stuck on the display when using regular
  CPU display space transform and if GLSL is available
  it'll make image displayed with a GLSL shader.

- As an additional change, byte buffers now also uses
  GLSL display transform.

  So now only dutehr and RGB curves are stoppers for
  using GLSL for all kind of display transforms.

7 years agocode cleanup: unused functions
Campbell Barton [Wed, 3 Apr 2013 15:04:24 +0000 (15:04 +0000)]
code cleanup: unused functions

7 years agoFix #34856: crash passing an object rather than a mesh to bpy.data.mesh.remove(),
Brecht Van Lommel [Wed, 3 Apr 2013 13:43:12 +0000 (13:43 +0000)]
Fix #34856: crash passing an object rather than a mesh to bpy.data.mesh.remove(),
this should give an error message but it didn't.

7 years agoFix for old compatibility issue: 2.59.2 do_versions was not handling all local node...
Lukas Toenne [Wed, 3 Apr 2013 11:36:48 +0000 (11:36 +0000)]
Fix for old compatibility issue: 2.59.2 do_versions was not handling all local node trees (world and lamp missing).

7 years agocode cleanup: use more (blender) conventional naming for group functions.
Campbell Barton [Wed, 3 Apr 2013 11:28:42 +0000 (11:28 +0000)]
code cleanup: use more (blender) conventional naming for group functions.
also change dump_rna2xml.py to dump bpy.data by default.

7 years agonew ruler option to be able to interactively measure surface thichness as you drag...
Campbell Barton [Wed, 3 Apr 2013 10:45:13 +0000 (10:45 +0000)]
new ruler option to be able to interactively measure surface thichness as you drag the ruler about.
Request from Bart Veldhuizen.

Access with Shift+Drag

7 years agopass snap arguments so the ruler doesn't have to temp overwrite scene vars.
Campbell Barton [Wed, 3 Apr 2013 09:48:21 +0000 (09:48 +0000)]
pass snap arguments so the ruler doesn't have to temp overwrite scene vars.
also expose snapObjectsRayEx() for more convenient ray-casting about the scene.

7 years agoFix #33628, Segmentation fault after pasting a closed group of nodes into an open...
Lukas Toenne [Wed, 3 Apr 2013 09:10:29 +0000 (09:10 +0000)]
Fix #33628, Segmentation fault after pasting a closed group of nodes into an open group. Finally now there is a proper check for pasting nodes into groups. It uses the poll_instance callback of node types to determine if a node can be added into a specific node tree. Currently this is only implemented for group nodes and does a recursive check to avoid pasting a node group into itself (on any level, also nested groups).

7 years agoFix/Workaround #34854: render buffer update writes to wrong layer
Sergey Sharybin [Wed, 3 Apr 2013 09:08:02 +0000 (09:08 +0000)]
Fix/Workaround #34854: render buffer update writes to wrong layer

Was caused by recent change in image_buffer_rect_update which
was writing data to ibuf-rect_float. Apparently, this buffer
could point to different render layer than came from RenderResult.

Made quick fix for this, which ends up in skipping float buffer
update in image_buffer_rect_update and skipping GLSL when image
has both byte and float buffers.

This will bring speed down a bit, but slower blender is better
than broken blender.

Proper fix will arrive later this week.

7 years agoFix #34838, Can not append mesh from 2.5 (Crash in Nodes). The compatibility code...
Lukas Toenne [Wed, 3 Apr 2013 08:25:29 +0000 (08:25 +0000)]
Fix #34838, Can not append mesh from 2.5 (Crash in Nodes). The compatibility code for node group socket indices was assuming the new group node types even for 2.56.2 files, before these node groups had actually been converted ... Needs to use old way of identifying node group links (fromnode/tonode == NULL) instead of input/output node types.

7 years agoFix for missing integer 'type' of the virtual extension socket in group nodes. This...
Lukas Toenne [Wed, 3 Apr 2013 07:56:36 +0000 (07:56 +0000)]
Fix for missing integer 'type' of the virtual extension socket in group nodes. This could lead to crash in node groups when trying to undefined stack values of the extension socket. type just needs to be set to SOCK_CUSTOM==-1, so the BI execution knows not to look for a stack entry.

7 years agoCleanup outliner_dropzone code
Dan Eicher [Wed, 3 Apr 2013 07:42:56 +0000 (07:42 +0000)]
Cleanup outliner_dropzone code

 * deduplicated a bunch of code and moved it into outliner_dropzone_find()
 * moved all the per-dropzone checks into the poll functions
 * one functional change, disable drop parenting on self & self->parent

The basic assumption: if poll() == true then outliner_dropzone_find() will return a valid TreeElement

7 years agouse floats for transform snapping distance comparisons
Campbell Barton [Wed, 3 Apr 2013 07:36:37 +0000 (07:36 +0000)]
use floats for transform snapping distance comparisons

7 years agofix [#34825] Transparent background of Empty Images clips objects behind them away...
Campbell Barton [Wed, 3 Apr 2013 05:16:15 +0000 (05:16 +0000)]
fix [#34825] Transparent background of Empty Images clips objects behind them away when Empty is not selected

allow 'Transparency' option to be used on empty-images.

7 years agofix [#34850] "x" to clear ID prop fields is too close to the right border
Campbell Barton [Wed, 3 Apr 2013 05:02:33 +0000 (05:02 +0000)]
fix [#34850] "x" to clear ID prop fields is too close to the right border

7 years agofix [#34847] Box selecting shape keys of a mask causes crash
Campbell Barton [Wed, 3 Apr 2013 03:25:26 +0000 (03:25 +0000)]
fix [#34847] Box selecting shape keys of a mask causes crash

7 years agostyle cleanup
Campbell Barton [Wed, 3 Apr 2013 01:36:00 +0000 (01:36 +0000)]
style cleanup

7 years agoremove workaround for [#34346], checked on applying this workaround for armatures...
Campbell Barton [Wed, 3 Apr 2013 01:35:24 +0000 (01:35 +0000)]
remove workaround for [#34346], checked on applying this workaround for armatures too but it happens in more cases then I originally thought.
for now users of opensource Nouveau and ATI drivers can't use multiple windows, the bug needs to be fixed in the driver.

7 years agoUse of text datablocks for storing Python style modules.
Tamito Kajiyama [Wed, 3 Apr 2013 00:00:29 +0000 (00:00 +0000)]
Use of text datablocks for storing Python style modules.
Suggested by Brecht Van Lommel and Campbell Barton through code review comments.

Previously style modules were external Python script files whose absolute paths
were kept in .blend files.  Now style modules are stored in .blend files as text
datablocks.

Style modules are configured in three steps:
1. Open an external style module file (or create a new text datablock) in the
Text Editor in Blender.
2. Add a style module to the list of style modules (by pressing the "Add" button)
in the Render Layer properties window.
3. Click the name entry and select the style module from the drop-down menu.

7 years agoFix incorrect OS X warning message in console when using multisample antialiasing
Brecht Van Lommel [Tue, 2 Apr 2013 19:18:38 +0000 (19:18 +0000)]
Fix incorrect OS X warning message in console when using multisample antialiasing
about number of samples not matching the requested number.

7 years agoFix #34759: cycles texture influence for particles not shown correct when switching
Brecht Van Lommel [Tue, 2 Apr 2013 18:19:37 +0000 (18:19 +0000)]
Fix #34759: cycles texture influence for particles not shown correct when switching
to a different texture slot.

7 years agoFix #34849: crash in operator search menu, due to brush stencil poll
Brecht Van Lommel [Tue, 2 Apr 2013 18:19:35 +0000 (18:19 +0000)]
Fix #34849: crash in operator search menu, due to brush stencil poll
function not checking NULL pointer.

7 years agoTweak allocation vars for linear space so black is converted
Sergey Sharybin [Tue, 2 Apr 2013 18:19:16 +0000 (18:19 +0000)]
Tweak allocation vars for linear space so black is converted
to black when using GLSL display transform.

7 years agoBox and Ellipse mask nodes will now output shape
Sergey Sharybin [Tue, 2 Apr 2013 17:56:41 +0000 (17:56 +0000)]
Box and Ellipse mask nodes will now output shape
even if nothing is attached to input.

They'll use black image with render resolution
as a background if nothing is attached to mask input.

Was a request from 4K ToS project.

7 years agoFix #34803: blender internal SSS rendering black/nan with negative texture colors.
Brecht Van Lommel [Tue, 2 Apr 2013 17:49:31 +0000 (17:49 +0000)]
Fix #34803: blender internal SSS rendering black/nan with negative texture colors.

7 years agoFix for potential missing draw-update when building without OCIO
Sergey Sharybin [Tue, 2 Apr 2013 17:39:34 +0000 (17:39 +0000)]
Fix for potential missing draw-update when building without OCIO

7 years agoMore usage of GLSL for color managed image drawing
Sergey Sharybin [Tue, 2 Apr 2013 17:28:37 +0000 (17:28 +0000)]
More usage of GLSL for color managed image drawing

Uses GLSL for drawing image in Image Editor space.

This requires change in image_buffer_rect_update, so
original float buffer is being updated as well. This
is unlikely be something bad, but will keep an eye
on this change.

Also no byte buffer allocation happens there, this
is so because byte buffer used for display only
and in case of GLSL display such allocation and
partial update is just waste of time.

Also switched OpenGL render from using CPU color
space linearization to GLSL color space transform.
Makes OpenGL rendering pretty much faster (but
still slower than in 2.60).

internal changes:

- Added functions to setup GLSL shader for color
  space conversion in colormanagement.c. Currently
  conversion form a colorspace defined by a role to
  linear space is implemented. Easy to extend to
  other cases.

- Added helper functions to glutil.c which does
  smarter image buffer draw (calling all needed OCIO
  stuff, editors now could draw image buffer with a
  single function call -- all the checks are done in
  glutil.c).

- Also added helper function for buffer linearization
  from a given role to glutil.c. Everyone now able to
  linearize buffer with a single call.

  This function will do nothing is GLSL routines fails
  or not supported.

  And one last this: this function uses offscreen
  drawing, could potentially give issues on some
  cards, also will keep an eye on this.

7 years agoFixes for recent GLSL display space conversions
Sergey Sharybin [Tue, 2 Apr 2013 17:28:29 +0000 (17:28 +0000)]
Fixes for recent GLSL display space conversions

- Building without OCIO will give correct results again
- If GLSL failed to compile, fallback to glaDrawPixelsAuto
  will happen.

7 years agoMore Histogram fixes:
Ton Roosendaal [Tue, 2 Apr 2013 17:12:21 +0000 (17:12 +0000)]
More Histogram fixes:

Sequencer histogram was calculating still badly, now it uses a per-color
component counter to calculate the levels (instead of counter for all)

7 years agoFix #34711: matcap option not showing when switching from cycles material/rendered
Brecht Van Lommel [Tue, 2 Apr 2013 16:51:23 +0000 (16:51 +0000)]
Fix #34711: matcap option not showing when switching from cycles material/rendered
draw mode to blender internal.

7 years agoFix #34788, #34744: GLSL error, #version line needs to be at the top of the shader
Brecht Van Lommel [Tue, 2 Apr 2013 16:37:31 +0000 (16:37 +0000)]
Fix #34788, #34744: GLSL error, #version line needs to be at the top of the shader
and this wasn't the case anymore after recent changes.

7 years agoCycles: small code cleanup + fix SSS closure mixed with other closures doing
Brecht Van Lommel [Tue, 2 Apr 2013 16:37:28 +0000 (16:37 +0000)]
Cycles: small code cleanup + fix SSS closure mixed with other closures doing
a bit too much work.

7 years agoFix 34831: SSS issue with non-progressive render, due to error in closure merging...
Brecht Van Lommel [Tue, 2 Apr 2013 15:53:24 +0000 (15:53 +0000)]
Fix 34831: SSS issue with non-progressive render, due to error in closure merging code.

7 years agoBugfix for [#34845] FFmpeg: .wav file playback crashes Blender since r55693
Joerg Mueller [Tue, 2 Apr 2013 15:48:09 +0000 (15:48 +0000)]
Bugfix for [#34845] FFmpeg: .wav file playback crashes Blender since r55693

7 years agoFix #34832: SSS render freeze with object instances.
Brecht Van Lommel [Tue, 2 Apr 2013 14:19:05 +0000 (14:19 +0000)]
Fix #34832: SSS render freeze with object instances.

7 years agoFix #34833: crash using SSS node on windows, invalid memory access when building...
Brecht Van Lommel [Tue, 2 Apr 2013 13:34:50 +0000 (13:34 +0000)]
Fix #34833: crash using SSS node on windows, invalid memory access when building lookup table.

7 years agoRemoved leftover debug print.
Ton Roosendaal [Tue, 2 Apr 2013 13:15:12 +0000 (13:15 +0000)]
Removed leftover debug print.

7 years agoFix compilation on MinGW(64/32)
Antony Riakiotakis [Tue, 2 Apr 2013 13:07:01 +0000 (13:07 +0000)]
Fix compilation on MinGW(64/32)

Also, add appropriate lib paths for recent OpenCollada for mingw32 (coming soon to an svn server near you)

7 years agoMissing GLEW path in CMake, fixes compile error in OS X.
Ton Roosendaal [Tue, 2 Apr 2013 12:54:47 +0000 (12:54 +0000)]
Missing GLEW path in CMake, fixes compile error in OS X.

7 years agoUsability fix, for color grading.
Ton Roosendaal [Tue, 2 Apr 2013 12:41:11 +0000 (12:41 +0000)]
Usability fix, for color grading.

The Scopes and Histogram (Image editor, Sequencer) were not updating on
changes in color or display settings.

- Missing notifiers for refreshing
- Missing code to draw correct for managed byte buffers.

7 years agoKey mapping conflict for 'find node' versus 'add socket link' (noodle).
Ton Roosendaal [Tue, 2 Apr 2013 12:38:05 +0000 (12:38 +0000)]
Key mapping conflict for 'find node' versus 'add socket link' (noodle).

Historically, F shortcut was for 'add edge/face' in Blender.
In Node editor, F makes a noodle, ctrl+f made a noodle replace too.

To keep ALT+F work for "Unattach from frame", the solution I now propose
is to make CTRL+F for finding nodes, and SHIFT+F for 'add noodle with replace'.

7 years agoFix for #34756 and #34810, crashes when dropping nodes onto noodles and a related...
Lukas Toenne [Tue, 2 Apr 2013 11:59:27 +0000 (11:59 +0000)]
Fix for #34756 and #34810, crashes when dropping nodes onto noodles and a related forward compatibility bug.

Added a sanity check to the ED_node_link_insert function to ensure it exits gracefully if no suitable sockets can be found. This was the problem with custom pynodes, which don't define the 'type' DNA of old sockets. The operator will have to be generalized for future nodes, but for now just not crashing seems good enough.

Script node crashes in #34810 were caused by uninitialized 'type' integer as well. This is now done in the set_typeinfo function for sockets (like for trees and nodes too), to avoid any potential remaining issues of this kind. Note that new files need to be loaded and saved again once to be forward compatible again.

7 years agodraw helper lines for inset and bevel operators, the mouse distance from the selectio...
Campbell Barton [Tue, 2 Apr 2013 10:48:11 +0000 (10:48 +0000)]
draw helper lines for inset and bevel operators, the mouse distance from the selection center was used, but often it was hard to tell where this was and you'd have to guess.
adds ED_region_draw_mouse_line_cb() generic draw callback for mouse helper lines.

7 years agoUsual typo fixing...
Bastien Montagne [Tue, 2 Apr 2013 07:27:39 +0000 (07:27 +0000)]
Usual typo fixing...

7 years agoCompile fix: size_t (required by BLI_string.h) was undefined
Joshua Leung [Tue, 2 Apr 2013 03:51:42 +0000 (03:51 +0000)]
Compile fix: size_t (required by BLI_string.h) was undefined