blender.git
6 years agoLock-free memory allocator
Sergey Sharybin [Thu, 10 Oct 2013 11:58:01 +0000 (11:58 +0000)]
Lock-free memory allocator

Release builds will now use lock-free allocator by
default without any internal locks happening.

MemHead is also reduces to as minimum as it's possible.
It still need to be size_t stored in a MemHead in order
to make us keep track on memory we're requesting from
the system, not memory which system is allocating. This
is probably also faster than using a malloc's usable
size function.

Lock-free guarded allocator will say you whether all
the blocks were freed, but wouldn't give you a list
of unfreed blocks list. To have such a list use a
--debug or --debug-memory command line arguments.

Debug builds does have the same behavior as release
builds. This is so tools like valgrind are not
screwed up by guarded allocator as they're currently
are.

--
svn merge -r59941:59942 -r60072:60073 -r60093:60094 \
          -r60095:60096 ^/branches/soc-2013-depsgraph_mt

6 years agoCleanup: Consistent names for draw callbacks in bNodeType.
Lukas Toenne [Thu, 10 Oct 2013 11:33:20 +0000 (11:33 +0000)]
Cleanup: Consistent names for draw callbacks in bNodeType.

This aims to establish a common pattern for the various confusing draw callback function pointers in bNodeType:

draw_<purpose>_<nodetype>[_ex]

Currently there are 4 different types of draw callbacks:
* draw_nodetype, draw_nodetype_prepare: Main draw functions, allows specialized node drawing for things like frames and reroute nodes. Not exposed in the API.
* draw_buttons, draw_buttons_ex: Optional non-socket buttons, most commonly used callback. Extended version used in sidebar for verbose buttons that don't fit into a node.
* draw_backdrop: Draw elements in the backdrop (compositor only). Not exposed in the API.
* draw_input, draw_output: Specialized socket drawing for some nodes, only for OutputFile node. Should not be used any further and be removed at some point. Not exposed in the API.

6 years agoSupport for baking vertex colors to textures.
Antony Riakiotakis [Thu, 10 Oct 2013 11:00:12 +0000 (11:00 +0000)]
Support for baking vertex colors to textures.

It allows effects such as baking vertex dirt maps to textures.
Also vertex based painting painting may be faster in the future,
so this is useful to have.

Thanks to Sergey for the review!

6 years agoWeight Paint Tools: Add "Subset" option to "Normalize All"
Irie Shinsuke [Thu, 10 Oct 2013 06:33:23 +0000 (06:33 +0000)]
Weight Paint Tools: Add "Subset" option to "Normalize All"

This option is needed when vertex groups are used for both armature
deformation and the other purpose such as influence of mesh modifier.

Thanks to Campbell for code review!

6 years agostyle cleanup
Campbell Barton [Wed, 9 Oct 2013 21:19:25 +0000 (21:19 +0000)]
style cleanup

6 years agoFix compilation error of OCIO with MSVC
Sergey Sharybin [Wed, 9 Oct 2013 20:45:29 +0000 (20:45 +0000)]
Fix compilation error of OCIO with MSVC

6 years agofix save-as-copy option changing the filepath for new files.
Campbell Barton [Wed, 9 Oct 2013 20:27:38 +0000 (20:27 +0000)]
fix save-as-copy option changing the filepath for new files.

6 years agoLibmv: make sure CmakeList.txt is re-created with all needed headers on re-bundle
Sergey Sharybin [Wed, 9 Oct 2013 20:21:12 +0000 (20:21 +0000)]
Libmv: make sure CmakeList.txt is re-created with all needed headers on re-bundle

6 years agoFix windows scons OSL build error, just use quotes now instead of array.
Brecht Van Lommel [Wed, 9 Oct 2013 20:11:18 +0000 (20:11 +0000)]
Fix windows scons OSL build error, just use quotes now instead of array.

6 years agoLibmv: move platform-specific defines into own file
Sergey Sharybin [Wed, 9 Oct 2013 20:02:02 +0000 (20:02 +0000)]
Libmv: move platform-specific defines into own file

6 years agoFix compilation error after recent libmv change
Sergey Sharybin [Wed, 9 Oct 2013 19:49:09 +0000 (19:49 +0000)]
Fix compilation error after recent libmv change

- Tweaked typedefs in stdint so they match
  what we've got in BLI_sys_types (needed to
  explicitly tell sign to MSVC).

  Not so much harmful to be more explicit here,
  but we really better to have single stdint
  int blender.

- Tweaked allocations macros so MSVC is happy
  with structures allocation.

6 years agofix [#37011] "Save Copy" option misfunction
Dalai Felinto [Wed, 9 Oct 2013 19:29:50 +0000 (19:29 +0000)]
fix [#37011] "Save Copy" option misfunction

6 years agoFix OSL shader build failing with spaces in the path to build directory,
Brecht Van Lommel [Wed, 9 Oct 2013 18:48:32 +0000 (18:48 +0000)]
Fix OSL shader build failing with spaces in the path to build directory,
patch by Campbell.

6 years agoFix [#37012] The new export split normal does nor produce correct results.
Bastien Montagne [Wed, 9 Oct 2013 17:48:27 +0000 (17:48 +0000)]
Fix [#37012] The new export split normal does nor produce correct results.

Was a silly error introduced in algo during optimization, vertices having sharp and smooth edges would only get the first poly's normal for each "smooth loop group".

Also done a (minor) optimization, and some comment fixes.

6 years agoFix uber evil (-15 alignment points) own buffer overflow
Antony Riakiotakis [Wed, 9 Oct 2013 16:53:35 +0000 (16:53 +0000)]
Fix uber evil (-15 alignment points) own buffer overflow

6 years agoFix #36991, After rendering with Sampled Motion Blur, the moving objects place is...
Lukas Toenne [Wed, 9 Oct 2013 16:49:13 +0000 (16:49 +0000)]
Fix #36991, After rendering with Sampled Motion Blur, the moving objects place is wrong.
With mblur the render function was setting scene frame for each blur sample and calling DAG update, but not after the last sample is finished, leaving the scene in the wrong frame.

6 years agominor code cleanup.
Antony Riakiotakis [Wed, 9 Oct 2013 16:04:08 +0000 (16:04 +0000)]
minor code cleanup.

6 years agoPaint cursor overlays: Delete the cursor texture overlay resources when
Antony Riakiotakis [Wed, 9 Oct 2013 16:00:15 +0000 (16:00 +0000)]
Paint cursor overlays: Delete the cursor texture overlay resources when
exiting a paint mode.

6 years agoImplementation of curve mapping in GLSL
Sergey Sharybin [Wed, 9 Oct 2013 15:57:32 +0000 (15:57 +0000)]
Implementation of curve mapping in GLSL

The title says it all, now having curve mapping
enabled in color management settings wouldn't
force fallback from GLSL to CPU based color space
conversion.

6 years agoDerivative map baker
Sergey Sharybin [Wed, 9 Oct 2013 15:51:14 +0000 (15:51 +0000)]
Derivative map baker

Added support for derivative map baking, which
is accessable as a dedicated baker type. Works
pretty much the same as displacement map baker,
but gives you derivative map.

In fact, inernally this baker is just a filter
which applies on the result of displacement map.

Both regular and multires baking are supported.

Patch by Morten Mikkelsen and self.

6 years agofix [#37007] Save to file - increment number doesn't update background color of filen...
Campbell Barton [Wed, 9 Oct 2013 15:36:04 +0000 (15:36 +0000)]
fix [#37007] Save to file - increment number doesn't update background color of filename field if hovered

6 years agobetter naming for overlay panel, also only expose texture overlay for
Antony Riakiotakis [Wed, 9 Oct 2013 15:21:49 +0000 (15:21 +0000)]
better naming for overlay panel, also only expose texture overlay for
modes that support it.

6 years agoFix for evil bug in last commit, the image painting brush was being used
Antony Riakiotakis [Wed, 9 Oct 2013 15:07:48 +0000 (15:07 +0000)]
Fix for evil bug in last commit, the image painting brush was being used
for the overlay option in all paint modes.

6 years agoSegregate all paint cursor overlay options under their own "Overlay"
Antony Riakiotakis [Wed, 9 Oct 2013 14:57:48 +0000 (14:57 +0000)]
Segregate all paint cursor overlay options under their own "Overlay"
panel in paint modes. Also expose all options of mask textures in the
mask texture panel, even if there is no texture, just like regular
textures are presented.

6 years agore-enable activating the text input field for new popup dialog boxes,
Campbell Barton [Wed, 9 Oct 2013 14:35:25 +0000 (14:35 +0000)]
re-enable activating the text input field for new popup dialog boxes,
I'd disabled this for 2.68 since it caused bug [#36109].

This fix now only enabled text activation for popups. (so the toolbar textboxes are skipped)

6 years agoMove guarded objetc allocation to a guardedalloc header
Sergey Sharybin [Wed, 9 Oct 2013 08:46:02 +0000 (08:46 +0000)]
Move guarded objetc allocation to a guardedalloc header

Also made libmv-capi use guarded objetc allocation.
Run into some suspecious cases when it was not so
clear whether memory is being freed or not.

Now we'll know for sure whether there're leaks or not :)

Having this macros in a guardedalloc header helps
using them in other areas (for now it's OCIO and libmv,
but in the future it'll be more places).

6 years agostyle cleanup
Campbell Barton [Wed, 9 Oct 2013 05:59:35 +0000 (05:59 +0000)]
style cleanup

6 years agofix for building with OPENJPEG after PSD commit
Dalai Felinto [Wed, 9 Oct 2013 02:48:42 +0000 (02:48 +0000)]
fix for building with OPENJPEG after PSD commit

reported via email, patch by PerfectionCat

6 years agofix building when WITH_PSD is OFF, stub is not needed afterall
Dalai Felinto [Wed, 9 Oct 2013 02:33:44 +0000 (02:33 +0000)]
fix building when WITH_PSD is OFF, stub is not needed afterall

6 years agoPhotoshop PSD support
Dalai Felinto [Tue, 8 Oct 2013 21:17:24 +0000 (21:17 +0000)]
Photoshop PSD support

We now support the combined layer of Photoshop files (stored as layer 0
in the file). This way users can keep their files as multilayer PSD and
Blender always handle them as flat images.

For perfect alpha this requires an OpenImageIO update:
https://github.com/OpenImageIO/oiio/commit/342cc2633ff590a3bb278481c61ae798c7148361

Photoshop sample files:
https://github.com/OpenImageIO/oiio-images

Brecht has some pending fixes to push for OIIO as well, so we may as
well wait to update our libraries.

What works:
===========
* 8bit images (with or without alpha)
* 16bits images (alpha discarded)
* Photoshop files saved with 'Maximum Compatibility'
* Cycles, Blender internal,  BGE (and player)

Known limitations
(due to OIIO dependency):
=========================
* Images with less than 4 channels show a wrong thumbnail (bug may be in  OIIO)
* Packed images are not supported
* We do not write PSD files.

Note: old Blenders have support for PSD via Quicktime library. But due
to license issues this was discontinued.

Many thanks for Brecht van Lommel for reviewing the patch, suggesting
multiple improvements and to help solving the alpha issue.

6 years agocode cleanup: redundant includes and add minor comments.
Campbell Barton [Tue, 8 Oct 2013 20:18:38 +0000 (20:18 +0000)]
code cleanup: redundant includes and add minor comments.

6 years agoremove redundant NULL checks
Campbell Barton [Tue, 8 Oct 2013 19:47:53 +0000 (19:47 +0000)]
remove redundant NULL checks

6 years agoTriangulate Modifier changes - using scanfill
Dalai Felinto [Tue, 8 Oct 2013 19:28:11 +0000 (19:28 +0000)]
Triangulate Modifier changes - using scanfill

The ear loop method is potentially too slow (OˆN).

We are not using the 'beauty' option at the moment.
I'll incorporate that next.
(and later specific methods for quad splitting)

Patch done in collaboration (and reviewed by)  with Campbell Barton.

6 years ago* Code cleanup, comments in readfile.c.
Thomas Dinges [Tue, 8 Oct 2013 17:15:49 +0000 (17:15 +0000)]
* Code cleanup, comments in readfile.c.

6 years agoCycles / SSS:
Thomas Dinges [Tue, 8 Oct 2013 17:07:18 +0000 (17:07 +0000)]
Cycles / SSS:
* Remove the compatible falloff SSS implementation. We shouldn't support two implementations in the long term, and 2.7x is a good release number do break some compatibility as well.

* Version patch added, so Files with Compatible falloff will automatically use Cubic now.

It was already mentioned in the manual, that Compatible is deprecated.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Shaders#BSSRDF

6 years agoid-data eyedropprt, currently only accessible via the Ekey,
Campbell Barton [Tue, 8 Oct 2013 15:32:54 +0000 (15:32 +0000)]
id-data eyedropprt, currently only accessible via the Ekey,

We need to investigate ways to add options like this without cluttering the interface.

6 years agoCycles / CUDA:
Thomas Dinges [Tue, 8 Oct 2013 15:29:28 +0000 (15:29 +0000)]
Cycles / CUDA:
* Remove support for  CUDA Toolkit 4.x, only Toolkit 5.0 and above are supported now.
* Remove support for sm_1x cards (< Fermi) for good. We didn't officially support those cards for a few releases already, now remove some special code that was still there.

6 years agoRelease Maintenance:
Thomas Dinges [Tue, 8 Oct 2013 15:23:19 +0000 (15:23 +0000)]
Release Maintenance:
* Blender 2.70 release cycle begins, BCon1.

6 years agomove eyedropper into its own file, uses mostly different includes to interface_ops.c
Campbell Barton [Tue, 8 Oct 2013 15:07:52 +0000 (15:07 +0000)]
move eyedropper into its own file, uses mostly different includes to interface_ops.c

6 years agoe-key to access the eyedropper over a color button.
Campbell Barton [Tue, 8 Oct 2013 13:58:28 +0000 (13:58 +0000)]
e-key to access the eyedropper over a color button.

6 years agomove color button event handling into its own function.
Campbell Barton [Tue, 8 Oct 2013 13:49:42 +0000 (13:49 +0000)]
move color button event handling into its own function.

6 years agomake bookmake name consistent was: FILE_OT_bookmark_add/FILE_OT_delete_bookmark
Campbell Barton [Tue, 8 Oct 2013 13:16:14 +0000 (13:16 +0000)]
make bookmake name consistent was: FILE_OT_bookmark_add/FILE_OT_delete_bookmark

6 years agoavoid allocating a dummy string for the unlink button.
Campbell Barton [Tue, 8 Oct 2013 13:10:22 +0000 (13:10 +0000)]
avoid allocating a dummy string for the unlink button.

6 years agoremove toolsettings (unused for a long time).
Campbell Barton [Tue, 8 Oct 2013 13:07:09 +0000 (13:07 +0000)]
remove toolsettings (unused for a long time).

6 years agoFix [#36993] Blender 2.69 test build freezes when changing metaball view resolution...
Bastien Montagne [Tue, 8 Oct 2013 12:52:01 +0000 (12:52 +0000)]
Fix [#36993] Blender 2.69 test build freezes when changing metaball view resolution to less that 0.100

Tweaking UI range settings, as suggested by Sergej Reich in report.

6 years agouse booleans in BKE_nurb_handles_autocalc and BMO_op_vinitf
Campbell Barton [Tue, 8 Oct 2013 12:35:58 +0000 (12:35 +0000)]
use booleans in BKE_nurb_handles_autocalc and BMO_op_vinitf

6 years agoreplace len_v3v3 with len_squared_v3v3 for comparisons.
Campbell Barton [Tue, 8 Oct 2013 12:03:49 +0000 (12:03 +0000)]
replace len_v3v3 with len_squared_v3v3 for comparisons.

6 years agocode cleanup: strange formatting.
Campbell Barton [Tue, 8 Oct 2013 11:27:39 +0000 (11:27 +0000)]
code cleanup: strange formatting.

6 years agouiSetRoundBox still took hard coded numbers in places.
Campbell Barton [Tue, 8 Oct 2013 11:23:14 +0000 (11:23 +0000)]
uiSetRoundBox still took hard coded numbers in places.

6 years agorename UI_OT_eyedropper to UI_OT_eyedropper_color to make way for other kinds of...
Campbell Barton [Tue, 8 Oct 2013 10:52:33 +0000 (10:52 +0000)]
rename UI_OT_eyedropper to UI_OT_eyedropper_color to make way for other kinds of eyedroppers.

6 years agofix for incorrect size passed to BLI_strncpy().
Campbell Barton [Mon, 7 Oct 2013 19:45:13 +0000 (19:45 +0000)]
fix for incorrect size passed to BLI_strncpy().

6 years agoAdd GLEW_STATIC definition for CMake as well.
Antony Riakiotakis [Mon, 7 Oct 2013 18:56:21 +0000 (18:56 +0000)]
Add GLEW_STATIC definition for CMake as well.

6 years agofix for crash on load if the file was saved in editmesh,
Campbell Barton [Mon, 7 Oct 2013 16:48:26 +0000 (16:48 +0000)]
fix for crash on load if the file was saved in editmesh,
BKE_mesh_uv_cdlayer_rename_index was checking editmesh pointer before it was NULL'd by direct_link_mesh.

6 years agoFix regression in r59316
Sergey Sharybin [Mon, 7 Oct 2013 16:06:15 +0000 (16:06 +0000)]
Fix regression in r59316

Different version could be passed here, added check
cached path is calculated with the proper one.

6 years agofix for casting shadows of scaled objects was made to X_BlenderRenderTools.cpp but...
Campbell Barton [Mon, 7 Oct 2013 12:14:59 +0000 (12:14 +0000)]
fix for casting shadows of scaled objects was made to X_BlenderRenderTools.cpp but not to GPC_RenderTools.cpp.

6 years agoremove minor differences between these 2 files which are almost exact duplicates...
Campbell Barton [Mon, 7 Oct 2013 12:12:59 +0000 (12:12 +0000)]
remove minor differences between these 2 files which are almost exact duplicates (tsk tsk!)

6 years agorevert r58693. patch [#36233], caused regression (bug report [#36959]).
Campbell Barton [Mon, 7 Oct 2013 11:51:59 +0000 (11:51 +0000)]
revert r58693. patch [#36233], caused regression (bug report [#36959]).

6 years agoFix #36981, Removing Sample line fails during render.
Lukas Toenne [Mon, 7 Oct 2013 09:25:39 +0000 (09:25 +0000)]
Fix #36981, Removing Sample line fails during render.
The SAMPLELINE flag in histogram was set during the BKE_histogram_update_sample_line function. That function in turn is called during every scope update in area draw function, meaning that during render
it constantly gets set. OTOH the operator tries to disable the flag on invoke, which "cancels" the sample line by default. So during render the operator un-setting of the flag has no effect, because the
render job immediatly triggers a redraw, which updates scopes and sets it again.

Moved the flag out of the actual sample line update function into the operator execute. Now only the operator enables/disables overall sample line drawing, while the rest of the update works as before.

6 years agoFix #36980: Color space issue when displaying pixel color in a render
Sergey Sharybin [Mon, 7 Oct 2013 08:06:19 +0000 (08:06 +0000)]
Fix #36980: Color space issue when displaying pixel color in a render

HSV values were calculated from a linear space color, which is
not so much useful and correct. Now RGB(A) buffers will use
color managed color for HSV values.

Still not sure which color to use for HSV when there's only one
channel in a buffer. This part left unchanged for now.

6 years agoRemove unused and meaningless line.
Sergey Sharybin [Mon, 7 Oct 2013 07:53:36 +0000 (07:53 +0000)]
Remove unused and meaningless line.

6 years agoFix for conf instructions for scons...
Bastien Montagne [Mon, 7 Oct 2013 07:42:00 +0000 (07:42 +0000)]
Fix for conf instructions for scons...

6 years agoBuild fix (issue could happen with scons,reported by ebrain on IRC, thanks).
Bastien Montagne [Mon, 7 Oct 2013 07:39:58 +0000 (07:39 +0000)]
Build fix (issue could happen with scons,reported by ebrain on IRC, thanks).

Var declared in an #ifdef DEBUG, but used in an #ifndef NDEBUG…

6 years agoRevert revision 59985, 59986, 60046 and 60067. These were fixes to improve save
Brecht Van Lommel [Sun, 6 Oct 2013 14:32:53 +0000 (14:32 +0000)]
Revert revision 59985, 59986, 60046 and 60067. These were fixes to improve save
and restore of window setups with multiple monitors, but they are also causing
regressions, in particular issues with Blender overlapping the taskbar and the
user preferences opening wrong. We decided to revert to the old behavior for
the release.

See bug #36707 for the full explanation.

6 years ago* Display warning icon for SSS/GPU message.
Thomas Dinges [Sun, 6 Oct 2013 12:22:30 +0000 (12:22 +0000)]
* Display warning icon for SSS/GPU message.

6 years agoCheck the node Add operator's type property before attempting to create a new node...
Lukas Toenne [Sun, 6 Oct 2013 10:49:40 +0000 (10:49 +0000)]
Check the node Add operator's type property before attempting to create a new node. This prevents python exceptions when calling it from the search menu, where the node type is unspecified.
Reported by Sebastian Koenig in unrelated bug report #36968.

6 years agoFix for Output File node operators: added a sanity type check to avoid using invalid...
Lukas Toenne [Sun, 6 Oct 2013 10:28:09 +0000 (10:28 +0000)]
Fix for Output File node operators: added a sanity type check to avoid using invalid node data.
Reported by Sebastian Koenig in unrelated bug report #36968.

6 years agoBetter fix for #36935 and 36316:
Brecht Van Lommel [Sat, 5 Oct 2013 19:56:34 +0000 (19:56 +0000)]
Better fix for #36935 and 36316:

* 32 bit GCC builds now have the SSE BVH optimizations turned off, but still
  compile with SSE flags for better performance.

* White color when rendering on Windows seems to have been unrelated to SSE,
  rather it was a graphics driver not supporting half float textures, added a
  check for that now.

6 years agoFix for my last customdata fix, accidentally left in comments.
Brecht Van Lommel [Sat, 5 Oct 2013 19:56:32 +0000 (19:56 +0000)]
Fix for my last customdata fix, accidentally left in comments.

6 years agorename presets not to use '+' character, also some typo fixes.
Campbell Barton [Sat, 5 Oct 2013 14:19:39 +0000 (14:19 +0000)]
rename presets not to use '+' character, also some typo fixes.

6 years agoreplaced export for OpenSim by Export for SL/OpenSim in Collada export user interface...
Gaia Clary [Sat, 5 Oct 2013 14:10:29 +0000 (14:10 +0000)]
replaced export for OpenSim by Export for SL/OpenSim in Collada export user interface (conforming to Linden Lab document secondlife.com/corporate/brand/trademark/sl_insl.php )

6 years agoReplaced opensim by sl+opensim in collada presets (conforming to Linden Lab document...
Gaia Clary [Sat, 5 Oct 2013 14:09:13 +0000 (14:09 +0000)]
Replaced opensim by sl+opensim in collada presets (conforming to Linden Lab document secondlife.com/corporate/brand/trademark/sl_insl.php )

6 years agoFix for unnecessary customdata warning with empty meshes.
Brecht Van Lommel [Sat, 5 Oct 2013 13:36:55 +0000 (13:36 +0000)]
Fix for unnecessary customdata warning with empty meshes.

6 years agoFix #36962, "Render emitter" option for hair is ignored in Cycles. Hair particles...
Lukas Toenne [Sat, 5 Oct 2013 12:46:32 +0000 (12:46 +0000)]
Fix #36962, "Render emitter" option for hair is ignored in Cycles. Hair particles use the hide_tris boolean to disable rendering of the emitter, but this was still ANDed with the "experimental" flag.
Hair is not experimental any longer, so this has to be removed.

6 years agorename overlap to holes for isect_point_poly_v2
Campbell Barton [Sat, 5 Oct 2013 12:36:35 +0000 (12:36 +0000)]
rename overlap to holes for isect_point_poly_v2

6 years agoavoid divide by zero with grid fill (when there is no selection)
Campbell Barton [Sat, 5 Oct 2013 11:59:15 +0000 (11:59 +0000)]
avoid divide by zero with grid fill (when there is no selection)

6 years agomore corrections to valgrind hinting.
Campbell Barton [Sat, 5 Oct 2013 04:59:43 +0000 (04:59 +0000)]
more corrections to valgrind hinting.

6 years agouse valgrind hints for memarena for better debugging info when using valgrind.
Campbell Barton [Sat, 5 Oct 2013 04:38:08 +0000 (04:38 +0000)]
use valgrind hints for memarena for better debugging info when using valgrind.
also quiet a false positive in BLI_mempool_free().

6 years agopressing enter over a file-text button is ignored (so enter in the file selector...
Campbell Barton [Fri, 4 Oct 2013 18:34:28 +0000 (18:34 +0000)]
pressing enter over a file-text button is ignored (so enter in the file selector works again).

6 years agoFix cycles hair render UI panel showing for particles that are not hair,
Brecht Van Lommel [Fri, 4 Oct 2013 18:04:29 +0000 (18:04 +0000)]
Fix cycles hair render UI panel showing for particles that are not hair,
patch by Greg Zaal.

6 years agoRemove prints from own r60549, sorry for the noise.
Bastien Montagne [Fri, 4 Oct 2013 17:49:26 +0000 (17:49 +0000)]
Remove prints from own r60549, sorry for the noise.

6 years agocode cleanup: warnings and minor edits.
Campbell Barton [Fri, 4 Oct 2013 17:47:58 +0000 (17:47 +0000)]
code cleanup: warnings and minor edits.

6 years agofix for lasso failing/glitches on overlapping lines, replace scanfill with 2d pixel...
Campbell Barton [Fri, 4 Oct 2013 15:02:05 +0000 (15:02 +0000)]
fix for lasso failing/glitches on overlapping lines, replace scanfill with 2d pixel filling for drawing and selection.

6 years agoAttempt to fix #36935: disable SSE optimizations on 32 bit windows too. Something
Brecht Van Lommel [Fri, 4 Oct 2013 14:47:37 +0000 (14:47 +0000)]
Attempt to fix #36935: disable SSE optimizations on 32 bit windows too. Something
strange is going on here, but I don't think it can be fixed before the release,
if it is worth at all spending time on this.

6 years agoFix obvious bug in particle code (copying normal into nor when in if(ornor) block...
Bastien Montagne [Fri, 4 Oct 2013 14:28:32 +0000 (14:28 +0000)]
Fix obvious bug in particle code (copying normal into nor when in if(ornor) block...), though probably harmless in current code...

6 years agoFix #36930: dynamic topology sculpting with masks gave bad results:
Brecht Van Lommel [Fri, 4 Oct 2013 13:40:21 +0000 (13:40 +0000)]
Fix #36930: dynamic topology sculpting with masks gave bad results:

* The mask was not subdivided properly on splitting edges, which gave interesting
  but definitely wrong fractal-like borders around masks.

* Edge splitting was only done where the mask was < 50%, with the reasoning that
  you can't do a 50% topology update. But this gives an ugly border in the mesh.
  The mask should already make the brush move the vertices only 50%, which means
  that topology updates will also happen less frequent, that should be enough.

6 years agoFix #36948: blender internal viewport render crashes holding shift+Z pressed
Brecht Van Lommel [Fri, 4 Oct 2013 12:30:00 +0000 (12:30 +0000)]
Fix #36948: blender internal viewport render crashes holding shift+Z pressed
to quickly toggle it on/off.

Problem is accessing freed data, now the job is ended immediately. Fix based
on patch from Sergey and investigation from Bastien.

6 years agoCode cleanup: remove unused function
Sergey Sharybin [Fri, 4 Oct 2013 12:22:54 +0000 (12:22 +0000)]
Code cleanup: remove unused function

6 years agoFix related to [#36926] 'scale' Node doesn't work properly.
Bastien Montagne [Fri, 4 Oct 2013 12:11:10 +0000 (12:11 +0000)]
Fix related to [#36926] 'scale' Node doesn't work properly.

Scene/Render "spaces" are actually absolute values, they do not use the input X/Y scale factors, hide them in this case.

Thanks to Lukas for review and improvement!

6 years agofix for lasso selection (in non-zbuf mode) when the line intersected its self.
Campbell Barton [Fri, 4 Oct 2013 10:48:24 +0000 (10:48 +0000)]
fix for lasso selection (in non-zbuf mode) when the line intersected its self.
isect_point_poly_v2() - add argument to check overlapping areas.

6 years agoChanging dither value will now invalidate cached display buffer
Sergey Sharybin [Fri, 4 Oct 2013 10:07:32 +0000 (10:07 +0000)]
Changing dither value will now invalidate cached display buffer

6 years agoFix #36939, Objects with nodes appear in gray in viewport, using Solid shade, and...
Lukas Toenne [Fri, 4 Oct 2013 08:27:54 +0000 (08:27 +0000)]
Fix #36939, Objects with nodes appear in gray in viewport, using Solid shade, and the Blender Engine (or Game Engine).
The "active ID node" concept has become slightly more complex with pynodes. To find the active material or other ID links in a node tree recursively requires a hash key based on the "parent" tree of the
current node group. To avoid returning NULL in case this key is not yet initialized (i.e. ID node has not been activated yet), just accept 0 key as well for the base node tree.

6 years agofix [#36947] "Edge Slide" bugs when "Even" is on
Campbell Barton [Fri, 4 Oct 2013 05:53:02 +0000 (05:53 +0000)]
fix [#36947] "Edge Slide" bugs when "Even" is on

was doing a linear interpolation between points on either side instead of interpolating along the edges.

6 years agofix [#36942] unfreed memory on trackball widget use
Campbell Barton [Fri, 4 Oct 2013 01:10:23 +0000 (01:10 +0000)]
fix [#36942] unfreed memory on trackball widget use

6 years agoTypo in variable name from previous commit, sorry.
Sergey Sharybin [Thu, 3 Oct 2013 16:39:30 +0000 (16:39 +0000)]
Typo in variable name from previous commit, sorry.

6 years agoset mempool debug in the game-engine-player too. also remove redundant mempool includes.
Campbell Barton [Thu, 3 Oct 2013 16:34:00 +0000 (16:34 +0000)]
set mempool debug in the game-engine-player too. also remove redundant mempool includes.

6 years agorigidbody: Flag bodies for validation when changing shape
Sergej Reich [Thu, 3 Oct 2013 16:12:02 +0000 (16:12 +0000)]
rigidbody: Flag bodies for validation when changing shape

This fixes a pretty old crash that occurs when changing the collision
shape to a mesh shape during simulation.

Thanks to Thomas Beck (plasmasolutions) for the report.

svn merge -r60310:60311 ^/branches/soc-2013-rigid_body_sim

6 years agofix crash in editmesh edge-dissolve, when 2 faces shared multiple edges, freed edges...
Campbell Barton [Thu, 3 Oct 2013 15:29:08 +0000 (15:29 +0000)]
fix crash in editmesh edge-dissolve, when 2 faces shared multiple edges, freed edges would be checked.

6 years agofreeing mempool elements now fills freed memory with --debug for debug builds.
Campbell Barton [Thu, 3 Oct 2013 14:44:33 +0000 (14:44 +0000)]
freeing mempool elements now fills freed memory with --debug for debug builds.

6 years agoChanged some labels from Second Life to OpenSim
Gaia Clary [Thu, 3 Oct 2013 14:24:54 +0000 (14:24 +0000)]
Changed some labels from Second Life to OpenSim

6 years agofix for crash dissolving faces, bmesh walkers were using freed mempool elements.
Campbell Barton [Thu, 3 Oct 2013 13:35:57 +0000 (13:35 +0000)]
fix for crash dissolving faces, bmesh walkers were using freed mempool elements.

use a convention for freeing walker-states where freed-dangling pointers aren't left assigned to prevent errors like this happening in future.