6 years agoSequencer: optionally show strip offsets
Campbell Barton [Tue, 9 Dec 2014 20:42:25 +0000 (21:42 +0100)]
Sequencer: optionally show strip offsets

was disabled in recent sequencer refactor, enable with view menu option.

6 years agoCorrect last commit checking knife edges
Campbell Barton [Tue, 9 Dec 2014 19:26:00 +0000 (20:26 +0100)]
Correct last commit checking knife edges

6 years agoCycles: Code cleanup, typo
Sergey Sharybin [Tue, 9 Dec 2014 19:08:04 +0000 (00:08 +0500)]
Cycles: Code cleanup, typo

6 years agoKnife: cuts along existing edges are now selected
Campbell Barton [Wed, 19 Nov 2014 01:38:06 +0000 (02:38 +0100)]
Knife: cuts along existing edges are now selected

This means cuts along existing edges don't have gaps in the selection.

Fixes T42616

6 years agoKnife: rename vert & edge 'draw' to 'is_cut'
Campbell Barton [Wed, 19 Nov 2014 01:19:56 +0000 (02:19 +0100)]
Knife: rename vert & edge 'draw' to 'is_cut'

More logical for checking if the edge is a cut into the mesh.

6 years agoKnife: fix edge aligned cuts, could add redundant verts
Campbell Barton [Tue, 9 Dec 2014 16:18:43 +0000 (17:18 +0100)]
Knife: fix edge aligned cuts, could add redundant verts

6 years agoSmallhash: add support for iterating value pointers
Campbell Barton [Tue, 9 Dec 2014 16:18:05 +0000 (17:18 +0100)]
Smallhash: add support for iterating value pointers

also add reinsert function

6 years agoGooseberry request, circle select for graph editor
Antony Riakiotakis [Tue, 9 Dec 2014 15:53:50 +0000 (16:53 +0100)]
Gooseberry request, circle select for graph editor

6 years agoFix T42857: Inconsistency between cache line visibility and ability to change frame...
Sergey Sharybin [Tue, 9 Dec 2014 15:33:19 +0000 (20:33 +0500)]
Fix T42857: Inconsistency between cache line visibility and ability to change frame from image space

6 years agoKnife: test if an edge is on the face boundary
Campbell Barton [Wed, 19 Nov 2014 01:10:57 +0000 (02:10 +0100)]
Knife: test if an edge is on the face boundary

Was checking if an edges midpoint was inside the face,
giving random results (point-inside for an edge location).

6 years agoFix T42488: Knife (selected_only + occlude) failed
Campbell Barton [Tue, 9 Dec 2014 14:51:58 +0000 (15:51 +0100)]
Fix T42488: Knife (selected_only + occlude) failed

6 years agoFix T4284: Drawing modified curves crashes
Campbell Barton [Tue, 9 Dec 2014 13:37:47 +0000 (14:37 +0100)]
Fix T4284: Drawing modified curves crashes

6 years agoFix bug reported by kopias on irc, crash when attempting to set canvas
Antony Riakiotakis [Tue, 9 Dec 2014 13:36:24 +0000 (14:36 +0100)]
Fix bug reported by kopias on irc, crash when attempting to set canvas
with a non-mesh object selected

6 years agoFix T42175: Modifiers don't render in sculpt mode using multires
Sergey Sharybin [Tue, 9 Dec 2014 11:57:59 +0000 (16:57 +0500)]
Fix T42175: Modifiers don't render in sculpt mode using multires

Modifier stack should ignore sculpt restrictions when creating derived render.

6 years agoFix T42630: Triangulate returns invalid face-map
Campbell Barton [Mon, 8 Dec 2014 15:57:39 +0000 (16:57 +0100)]
Fix T42630: Triangulate returns invalid face-map

Triangulate with beautify caused a bug when there were existing edges
could make the bmesh-operator return an invalid face-map.

Now the beauty is calculated on the 2d-tri's resulting from polyfill,
its simpler and faster.

6 years agoCleanup: remove scanfill define for polyfill code
Campbell Barton [Tue, 9 Dec 2014 11:19:26 +0000 (12:19 +0100)]
Cleanup: remove scanfill define for polyfill code

also rename vars which were previously used for scanfill.

6 years agoAdd edgehash remove, clear functions, Heap clear
Campbell Barton [Mon, 8 Dec 2014 23:32:20 +0000 (00:32 +0100)]
Add edgehash remove, clear functions, Heap clear

Edgehash was missing removal functions (remove, popkey, clear),
since it wasn't needed so far, but is based on same code as ghash which has them.

also add heap clear() method so we can reuse heaps.

(needed for upcoming fix).

6 years agoCleanup: simplify heap popmin
Campbell Barton [Mon, 8 Dec 2014 23:13:35 +0000 (00:13 +0100)]
Cleanup: simplify heap popmin

6 years agoCleanup: remove unused pointer in Heap
Campbell Barton [Mon, 8 Dec 2014 23:02:18 +0000 (00:02 +0100)]
Cleanup: remove unused pointer in Heap

6 years agoFix Mesh Objects with missing textures or wrong texture path now import without texture
Gaia Clary [Mon, 8 Dec 2014 18:57:31 +0000 (19:57 +0100)]
Fix Mesh Objects with missing textures or wrong texture path now import without texture

6 years agoFix T42824: Proxy bone custom-shape lost on undo
Campbell Barton [Mon, 8 Dec 2014 15:46:42 +0000 (16:46 +0100)]
Fix T42824: Proxy bone custom-shape lost on undo

6 years agoFix T42838: Make dupli's real use_hierarchy fails
Campbell Barton [Mon, 8 Dec 2014 15:13:27 +0000 (16:13 +0100)]
Fix T42838: Make dupli's real use_hierarchy fails

Regression since the dupli-object refactor.

6 years agoCycles: Fix compilation error with MinGW and logging enabled
Sergey Sharybin [Mon, 8 Dec 2014 14:36:56 +0000 (19:36 +0500)]
Cycles: Fix compilation error with MinGW and logging enabled

6 years agoDocs: reference the new manual
Campbell Barton [Mon, 8 Dec 2014 10:15:56 +0000 (11:15 +0100)]
Docs: reference the new manual

6 years agoBMesh: ensure iterator macros assign to valid types
Campbell Barton [Mon, 8 Dec 2014 09:54:56 +0000 (10:54 +0100)]
BMesh: ensure iterator macros assign to valid types

note, this is for C++ code which expects a cast, (will be added later)
also add a macro for nop-expressions (EXPR_NOP),
when we never want an expression to be evaluated, but it should still be valid.

6 years agoCleanup: spelling
Campbell Barton [Mon, 8 Dec 2014 08:46:21 +0000 (09:46 +0100)]
Cleanup: spelling

6 years agoCleanup: remove unused operator-type member
Campbell Barton [Mon, 8 Dec 2014 08:45:47 +0000 (09:45 +0100)]
Cleanup: remove unused operator-type member

6 years agoCleanup: Minor edits to widget emboss code
julianeisel [Sun, 7 Dec 2014 23:38:36 +0000 (00:38 +0100)]
Cleanup: Minor edits to widget emboss code

* Rename "emboss" to "widget_emboss"
* Remove duplicated UI_GetThemeColor4ubv function

I made sure version bump and Save User Settings are working correctly ;P

6 years agoFix non-Windows SCons compiling error after IME merge
julianeisel [Sun, 7 Dec 2014 22:57:51 +0000 (23:57 +0100)]
Fix non-Windows SCons compiling error after IME merge

6 years agoForgot to add new files in recent IME commit
Severin [Sun, 7 Dec 2014 17:23:02 +0000 (18:23 +0100)]
Forgot to add new files in recent IME commit

Sorry, my bad :/

6 years agoBugfix T42774: BSurface addon doesn't work on new builds
Joshua Leung [Sun, 7 Dec 2014 13:42:10 +0000 (02:42 +1300)]
Bugfix T42774: BSurface addon doesn't work on new builds

It turns out that several important modelling addons depend on the assumption
that Grease Pencil data gets created on the active object instead of on scene
level. This commit adds a toggle for setting whether new Grease Pencil data
is created on scene or object level.

These work as follows:
* "Scene" = The behaviour originally introduced as part of the GPencil_EditStrokes
  changes. New strokes are added to the scene instead of the active object, making
  it easier to manage things when working with Grease Pencil in general.
* "Object" = The previous behaviour (from 2.50 to 2.72), where new strokes are added
  to the active object. This is now being reintroduced to soften the transition
  for addons out there which have been doing this in a lazy/lax way so far.

Now, what may be slightly confusing are the "fallback" measures in place:
* "Scene" - To ensure that loading old files goes ok without needing a version patch,
   if the active object has GPencil data, that will be used in place of the scene's
   own GPencil data.
* "Object" - If there was no active object at the time of creating strokes
  (for instance, if you delete the active object immediately before drawing),
  GPencil data gets attached to the current scene instead.

Since some tweaks may still be needed here, I've decided to bump the subversion
number so that we have a reference point when doing version patches.

6 years agoCorrect defines for binreloc
Campbell Barton [Sun, 7 Dec 2014 12:21:02 +0000 (13:21 +0100)]
Correct defines for binreloc

After recent moving path functions to appdir.c

patch T42826: by ldo (Lawrence D'Oliveiro)

6 years agoInput Method Editor (IME) support for text buttons
Severin [Sat, 6 Dec 2014 23:58:17 +0000 (00:58 +0100)]
Input Method Editor (IME) support for text buttons

Original patch by @random (D765) with some minor work done by @campbell
and me.

At this place, I'd like call out a number of people who were involved and
deserve a big "Thank you!":
* At the first place @randon who developed and submitted the patch
* The Blendercn community which helped a lot with testing - espacially
* @yuzukyo, @leon_cheung and @kjym3
* @campbellbarton, @mont29 and @sergey for their help and advises during
* review
* @ton who realized the importance of this early on and asked me for
* reviewing

We are still not finished, as this is only the first part of the
implementaion, but there's more to come!

6 years agoCMake: remove redundant include dir
Campbell Barton [Sat, 6 Dec 2014 12:01:47 +0000 (13:01 +0100)]
CMake: remove redundant include dir

6 years agoFix crash in RE_AcquiredResultGet32 on debug builds introduced yesterday
Jens Verwiebe [Sat, 6 Dec 2014 11:30:59 +0000 (12:30 +0100)]
Fix crash in RE_AcquiredResultGet32 on debug builds introduced yesterday

6 years agoOSX: change previous commit to not only make animation-player window frontmost but...
Jens Verwiebe [Sat, 6 Dec 2014 11:13:28 +0000 (12:13 +0100)]
OSX: change previous commit to not only make animation-player window frontmost but whole process

6 years agoCleanup: style from my previous commit
Mike Erwin [Sat, 6 Dec 2014 08:48:41 +0000 (03:48 -0500)]
Cleanup: style from my previous commit

6 years agoFix T42789: support 3Dconnexion wireless devices
Mike Erwin [Sat, 6 Dec 2014 07:48:51 +0000 (02:48 -0500)]
Fix T42789: support 3Dconnexion wireless devices

SpaceMouse Wireless
SpaceMouse Pro Wireless

Device info is from user reports. I don’t yet have the new devices, so
these are untested but likely to work :D

6 years agoFix inbetween mousemove event getting detected in hotkey buttons.
Brecht Van Lommel [Sat, 6 Dec 2014 01:27:13 +0000 (02:27 +0100)]
Fix inbetween mousemove event getting detected in hotkey buttons.

6 years agoFix playercompile after ecc03c8ed
Jens Verwiebe [Fri, 5 Dec 2014 17:51:19 +0000 (18:51 +0100)]
Fix playercompile after ecc03c8ed

6 years agoOSX: make sure window of new blender instance is front when playing animation
Jens Verwiebe [Fri, 5 Dec 2014 17:41:59 +0000 (18:41 +0100)]
OSX: make sure window of new blender instance is front when playing animation

6 years agoCycles: Report error via the new engine API
Sergey Sharybin [Fri, 5 Dec 2014 17:00:39 +0000 (22:00 +0500)]
Cycles: Report error via the new engine API

This way CUDA errors are visible in the image info line,
which makes things to behave the same across viewport and
final rendering.

That's right, we've got error reported via reports and info
line now. This is based on the feedback from our gooseberry

6 years agoRender API: Add RenderEngine.error_set() function
Sergey Sharybin [Fri, 5 Dec 2014 16:56:29 +0000 (21:56 +0500)]
Render API: Add RenderEngine.error_set() function

This function sets an error message which would be displayed after
rendering is over and info space lost the link to the engine.

6 years agoCycles: Report error to the blender using report API
Sergey Sharybin [Fri, 5 Dec 2014 16:27:52 +0000 (21:27 +0500)]
Cycles: Report error to the blender using report API

This way when something goes wrong in Cycles (for example out of VRAM, timelimit
launching the kernel etc) we'll have a nice report in the Info space header.

Sure it'll be nice to have mention of error in the image editor's information
line, but that's for the future.

This fixes T42747: "CUDA error" appears only momentarily, then disappears

6 years agoCycles: Add dedicated Progress::set_error() call
Sergey Sharybin [Fri, 5 Dec 2014 16:17:48 +0000 (21:17 +0500)]
Cycles: Add dedicated Progress::set_error() call

Currently it acts the same as set_cancel(), but this way we're able to
distinguish situations when rendering was aborted by user demand (for
example pressing Esc in standalone renderer) or if something went horribly
wrong (for example out of VRAM error).

6 years agoCycles: Early output from Scene::device_update when device error occurs
Sergey Sharybin [Fri, 5 Dec 2014 16:00:05 +0000 (21:00 +0500)]
Cycles: Early output from Scene::device_update when device error occurs

This way for example we wouldn't wait a fortune while BVH is building after
GPU run out of memory when loading images just to see the render failure

6 years agoCycles: Code cleanup, whitespace
Sergey Sharybin [Fri, 5 Dec 2014 14:28:09 +0000 (19:28 +0500)]
Cycles: Code cleanup, whitespace

6 years agoFix T42807, variance shadow map broken afterFBO changes.
Antony Riakiotakis [Fri, 5 Dec 2014 15:01:08 +0000 (16:01 +0100)]
Fix T42807, variance shadow map broken afterFBO changes.

This code was a bit do-it-yourself instead of relying on the API. Should
be OK now.

6 years agoAmendment to previous commit: Add an option to scene strips to disable GPencil
Joshua Leung [Fri, 5 Dec 2014 03:39:49 +0000 (16:39 +1300)]
Amendment to previous commit: Add an option to scene strips to disable GPencil

On second thought, it is probably still worthwhile to be able to disable GPencil
drawing on strips. By default, GPencil strokes are still shown by default now,
but they can be turned off using this option if it turns out that they are
getting in the way (e.g. a director/animator make some planning notes in the shot
at an earlier stage which are hidden for normal display now, but are still there
popping up sproadically during the animatic).

6 years agoGrease Pencil sketches get included when doing OpenGL previews for scene strips in...
Joshua Leung [Fri, 5 Dec 2014 02:47:23 +0000 (15:47 +1300)]
Grease Pencil sketches get included when doing OpenGL previews for scene strips in sequencer

After double checking the sequencer code, there doesn't seem to be any reason to
exclude these from the sequencer previews. This makes it possible to use the
sequencer to non-destructively chain together difference Grease Pencil animated
shots together without having to render each image sequence first, allowing for
a smoother workflow.

Just in case the initial assumption isn't entirely correct, I've put in place
an extra arg to the relevant functions which can be hooked up to a suitable
option on the scene strip later to turn this on/off as needed.

6 years agoFix for typo + memory leak
Joshua Leung [Fri, 5 Dec 2014 01:15:46 +0000 (14:15 +1300)]
Fix for typo + memory leak

6 years agoBugfix T42697: Hiding/unhiding NLA strip doesn't update the 3D Viewport
Joshua Leung [Fri, 5 Dec 2014 01:14:50 +0000 (14:14 +1300)]
Bugfix T42697: Hiding/unhiding NLA strip doesn't update the 3D Viewport

The Toggle Muting operator was missing code to tag the animation to get recalculated.

This was also missing from a few other operators too, including Snap, and
Add/Paste FModifiers .

6 years agoFix scons+mingw64 compiling - Ensure WITH_BF_CYCLES_LOGGING is defined and turned off
Joshua Leung [Fri, 5 Dec 2014 00:13:34 +0000 (13:13 +1300)]
Fix scons+mingw64 compiling - Ensure WITH_BF_CYCLES_LOGGING is defined and turned off

6 years agoTo make Strokes Edit Mode a bit more "solid", Tab key can be used to toggle out of it
Joshua Leung [Tue, 2 Dec 2014 12:33:29 +0000 (01:33 +1300)]
To make Strokes Edit Mode a bit more "solid", Tab key can be used to toggle out of it

6 years agoSelectmouse-drag now works to move GPencil verts
Joshua Leung [Tue, 2 Dec 2014 12:29:23 +0000 (01:29 +1300)]
Selectmouse-drag now works to move GPencil verts

6 years agoBGE VideoTexture: refresh() on ImageFFmpeg should have no effect.
Benoit Bolsee [Thu, 4 Dec 2014 22:49:15 +0000 (23:49 +0100)]
BGE VideoTexture: refresh() on ImageFFmpeg should have no effect.

ImageFFmpeg objects will not refresh properly because the image
file is closed immediately after creation. Therefore refresh()
should have no effect on them.
This was causing problems with ImageMix using ImageFFmpeg as
sources: refreshing the ImageMix object is required to update
the mix but it has the side effect of refreshing the underlying
sources, hence the need to skip refresh on fixed images.

6 years agoFix T41883 proxy sizes not correct.
Antony Riakiotakis [Thu, 4 Dec 2014 15:37:09 +0000 (16:37 +0100)]
Fix T41883 proxy sizes not correct.

Really bad issue which meant code could fetch an image buffer from the
stored cache and modify it. Generally sequence image buffers could come
from the cache and should not be modified directly. Easily solved by
scaling a copy of the original.

6 years agoGray out keyframe selection option when modal solver is used
Sergey Sharybin [Thu, 4 Dec 2014 15:09:51 +0000 (20:09 +0500)]
Gray out keyframe selection option when modal solver is used

6 years agoFix T42800: Blender suddenly closes after pressing solve camera motion
Sergey Sharybin [Thu, 4 Dec 2014 15:02:05 +0000 (20:02 +0500)]
Fix T42800: Blender suddenly closes after pressing solve camera motion

Couple of issues:

- Fist/last frame calculation was wrong

- Keyframe selection might silently fail leading to unpredictable math
  errors all over the place. Now if keyframe selection fails solver wouldn't

6 years agoBuildbot: Enable sm_52 for OSX
Sergey Sharybin [Thu, 4 Dec 2014 14:30:35 +0000 (19:30 +0500)]
Buildbot: Enable sm_52 for OSX

This actually enables it in the darwin scons config, that's how it always
used to be configured there.

6 years agoCycles: Fix compilation error after recent logging changes
Sergey Sharybin [Thu, 4 Dec 2014 11:48:14 +0000 (16:48 +0500)]
Cycles: Fix compilation error after recent logging changes

Forbid OSL from polluting current conext with obscure stuff from
windows.h, it's not useful and unhealthy anyway.

Maybe we sohuld also forbid using abbreviated Glog constants as
well tho.

6 years agoCleanup and fix for uninitialized output buffer of the sunbeams node.
Lukas Tönne [Thu, 4 Dec 2014 11:43:07 +0000 (12:43 +0100)]
Cleanup and fix for uninitialized output buffer of the sunbeams node.

Buffers should actually be cleared before running operations on them,
but this doesn't work for some reason.

Note also that the sunbeams node can show some creases and hard aliasing
when the source point is close to a bright area with strong gradient.
To fix this a better filtering algorithm, dithering or ray sampling
would need to be implemented. In the meantime simply blurring the
sunbeams result a bit should help (or simply avoid putting the source on
a bright spot).

6 years agoCleanup: minor int->bool cleanup.
Bastien Montagne [Thu, 4 Dec 2014 10:18:27 +0000 (11:18 +0100)]
Cleanup: minor int->bool cleanup.

6 years agoFix T42797: -Werror=sign-conversion Triggered in blf_glyph.c
Bastien Montagne [Thu, 4 Dec 2014 09:23:21 +0000 (10:23 +0100)]
Fix T42797: -Werror=sign-conversion Triggered in blf_glyph.c

Very minor, but since it was reported...

6 years agoFix building on OSX when OMP is enabled.
Bastien Montagne [Thu, 4 Dec 2014 08:55:17 +0000 (09:55 +0100)]
Fix building on OSX when OMP is enabled.

Reported by sebastian_k over IRC, thanks!

6 years agoGPU: code cleanup, no fundamental changes
Dalai Felinto [Wed, 3 Dec 2014 19:26:43 +0000 (17:26 -0200)]
GPU: code cleanup, no fundamental changes

6 years agoAnother crappy mistake in VBO code.
Antony Riakiotakis [Wed, 3 Dec 2014 19:20:04 +0000 (20:20 +0100)]
Another crappy mistake in VBO code.

6 years agoOnly annoy coders with warnings, not users.
Antony Riakiotakis [Wed, 3 Dec 2014 18:49:48 +0000 (19:49 +0100)]
Only annoy coders with warnings, not users.

6 years agoFix really crappy bug after vertex array refactor commit, it used vertex
Antony Riakiotakis [Wed, 3 Dec 2014 18:22:40 +0000 (19:22 +0100)]
Fix really crappy bug after vertex array refactor commit, it used vertex
arrays offset when VBOs were active and could cause a crash in driver.

Thanks to Dalai again for finding this out.

6 years agoCycles: Synchronize SCons with CMake in regard of logging
Sergey Sharybin [Wed, 3 Dec 2014 18:04:57 +0000 (23:04 +0500)]
Cycles: Synchronize SCons with CMake in regard of logging

6 years agoCycles: Enable logging by default
Sergey Sharybin [Wed, 3 Dec 2014 17:45:12 +0000 (22:45 +0500)]
Cycles: Enable logging by default

Default configuration already includes libmv and glog, so all
the dependencies are met. And logging is nice to have anyway.

This wouldn't give any slowdown, because all the logging is
silenced unless '--debug-cycles', plus no logging is done
from the speed critical code.

6 years agoCycles: Support logging when building with SCons
Sergey Sharybin [Wed, 3 Dec 2014 16:51:55 +0000 (21:51 +0500)]
Cycles: Support logging when building with SCons

Basically, title says ti all, the option is called WITH_BF_CYCLES_LOGGING

6 years agoFix typos.
Tamito Kajiyama [Wed, 3 Dec 2014 03:24:57 +0000 (12:24 +0900)]
Fix typos.

6 years agoMake sure materials are updated before passing to renderer in game
Antony Riakiotakis [Wed, 3 Dec 2014 17:11:57 +0000 (18:11 +0100)]
Make sure materials are updated before passing to renderer in game
engine - report by Dalai on irc.

6 years agoCycles: Remove workaround in ShaderClosure
Sergey Sharybin [Wed, 3 Dec 2014 15:50:25 +0000 (20:50 +0500)]
Cycles: Remove workaround in ShaderClosure

Since the aligned allocation of shader closures in OSL memory pool
this workaround is no longer needed.

Also put a comment which describes the desired layout of the structure
so array of shader closures is all nicely aligned.

6 years agoCycles: Use 16 bytes aligned closures in OSL
Sergey Sharybin [Wed, 3 Dec 2014 15:34:03 +0000 (20:34 +0500)]
Cycles: Use 16 bytes aligned closures in OSL

This solves bugs like T42210 which are caused by compiler being
smart and using some SSE instructions to operate with closure
classes, which was failing because those classes are not allocated
by the regular allocator but allocated in memory pool in OSL.

With newer versions of OSL it is now possible to force closure
classes being aligned to a given boundary and this commit uses
this new functionality.

Unfortunately, it means we're no longer compatible with older
versions of OSL, only latest git version from upstream and our
branch at github are supported:

For OSX and Windows it's not an issue because libraries are
already updated there, Linux users would need to run install_deps

6 years agoFix potential bug (though rather unlikely) - MAX_ID_NAME is 66 now!
Bastien Montagne [Wed, 3 Dec 2014 09:42:15 +0000 (10:42 +0100)]
Fix potential bug (though rather unlikely) - MAX_ID_NAME is 66 now!

6 years agoBGE: Fix Rigid body constraint deletion
HG1 [Wed, 3 Dec 2014 03:25:06 +0000 (19:25 -0800)]
BGE: Fix Rigid body constraint deletion

Fix for T41294.
Rigid body constraints are not deleted, if the corresponding game objects are deleted.

Reviewers: moguri

Differential Revision:

6 years agoFixes for T41168
Mitchell Stokes [Wed, 3 Dec 2014 03:06:19 +0000 (19:06 -0800)]
Fixes for T41168

after the completion of the action in "Flipper", layer is removed and the actuator mistakenly receive zero when trying to get the current frame

Patch Author: avrprj

Reviewers: moguri

Projects: #game_logic

Differential Revision:

6 years agoTex Paint: hide selected face-mask edges
Campbell Barton [Tue, 2 Dec 2014 16:56:40 +0000 (17:56 +0100)]
Tex Paint: hide selected face-mask edges

Internal selected edges were distracting when painting images.

Also remove unused flag.

6 years agoFreestyle: Avoid quietly ignoring errors in parameter_editor.lineset_pre callbacks.
Tamito Kajiyama [Tue, 2 Dec 2014 13:43:44 +0000 (22:43 +0900)]
Freestyle: Avoid quietly ignoring errors in parameter_editor.lineset_pre callbacks.

6 years agoFix T42767: Subsurfacing union boolean with same-named UVs crashes Blender
Sergey Sharybin [Tue, 2 Dec 2014 12:49:40 +0000 (17:49 +0500)]
Fix T42767: Subsurfacing union boolean with same-named UVs crashes Blender

Was own mistake in handling custom data layers in boolean modifier.

Campbell, do you mind double-checking if it's all correct?

6 years agoCycles: Remove workaround for missing sm_52 kernel, now we require it for Maxwell...
Thomas Dinges [Tue, 2 Dec 2014 12:45:39 +0000 (13:45 +0100)]
Cycles: Remove workaround for missing sm_52 kernel, now we require it for Maxwell cards.

6 years agoCycles: Enable native sm_52 kernel for Windows.
Thomas Dinges [Tue, 2 Dec 2014 12:41:43 +0000 (13:41 +0100)]
Cycles: Enable native sm_52 kernel for Windows.

6 years agoEnable sm52 for linux buildbot
Sergey Sharybin [Tue, 2 Dec 2014 12:30:59 +0000 (17:30 +0500)]
Enable sm52 for linux buildbot

Status of other builders:
- Windows are not known for me, would ask Martijn to look into
- OSX buildbot still needs a CUDA toolkit update

6 years agoCycles: Tweak to the include paths after recent atomics change
Sergey Sharybin [Tue, 2 Dec 2014 11:52:11 +0000 (16:52 +0500)]
Cycles: Tweak to the include paths after recent atomics change

Who could knew that include directories are not inherited in scons..

6 years agoFixes for atomic operations when building with MSVC
Sergey Sharybin [Tue, 2 Dec 2014 11:38:09 +0000 (16:38 +0500)]
Fixes for atomic operations when building with MSVC

6 years agoFollowup to previous linked list commit
Sergey Sharybin [Tue, 2 Dec 2014 11:09:12 +0000 (16:09 +0500)]
Followup to previous linked list commit

Windows doesn't have __func__ and utildefines was never included.

6 years agoCycles: Use lock in the memory statistics
Sergey Sharybin [Tue, 2 Dec 2014 10:36:44 +0000 (15:36 +0500)]
Cycles: Use lock in the memory statistics

CPU rendering is allowed to allocate memory from multiple threads,
which means statistics need to be avare of this.

6 years agoUse atomic operations in task pool
Sergey Sharybin [Tue, 2 Dec 2014 10:23:58 +0000 (15:23 +0500)]
Use atomic operations in task pool

This ensures proper values of currently running tasks in the pool
(previously difference between mutex locks when acquiring new job
and releasing it might in theory give wrong values).

6 years agoNo need to free GPU images from BKE_image_free_buffers when in background mode
Sergey Sharybin [Tue, 2 Dec 2014 09:50:36 +0000 (14:50 +0500)]
No need to free GPU images from BKE_image_free_buffers when in background mode

OpenGL in background mode is not used, so we can skip mutex lock and filling in
the list which later is never used.

This gives unmeasurable speedup by skipping mutex lock, plus solves memory leak
in the background mode.

6 years agoCleanup: style & de-duplicate
Campbell Barton [Tue, 2 Dec 2014 09:30:03 +0000 (10:30 +0100)]
Cleanup: style & de-duplicate

6 years agoUse more unique allocation strings for new links in the list
Sergey Sharybin [Tue, 2 Dec 2014 09:27:18 +0000 (14:27 +0500)]
Use more unique allocation strings for new links in the list

6 years agoFix: Grease Pencil strokes rendered with blotched colours/alpha in OpenGL Playblasts
Joshua Leung [Tue, 2 Dec 2014 06:13:45 +0000 (19:13 +1300)]
Fix: Grease Pencil strokes rendered with blotched colours/alpha in OpenGL Playblasts

Thanks to an anonymous tip (or shall we say, a tip from "Anonymous" - thank you
whoever you are :) it is now possible to render out Grease Pencil shots from
the viewport with correct colours again! This has been broken for a few releases
now, so it's great that this works again now, completing the last part of the
pipeline again.

6 years agoLasso Select for GPencil Strokes
Joshua Leung [Tue, 2 Dec 2014 00:52:48 +0000 (13:52 +1300)]
Lasso Select for GPencil Strokes

6 years agoGPencil Drawing: Enable polygon smoothing
Joshua Leung [Mon, 1 Dec 2014 23:51:55 +0000 (12:51 +1300)]
GPencil Drawing: Enable polygon smoothing

This helps to reduce jaggies from thin lines, while also resulting in nicer
lines elsewhere.

I'm not sure if it's just me, but it seems to render slightly differently to
before for 3d strokes too (i.e. they seem a bit softer). Hopefully the
difference isn't big enough to affect/degrade the art style of any projects.

6 years agoFix rare crash dragging number-buttons
Campbell Barton [Mon, 1 Dec 2014 22:30:54 +0000 (23:30 +0100)]
Fix rare crash dragging number-buttons

Could happen dragging shape-keys UIList & the lower slider at once.

6 years agoUI messages: Minor typo fix.
Bastien Montagne [Mon, 1 Dec 2014 21:25:54 +0000 (22:25 +0100)]
UI messages: Minor typo fix.

6 years agoCollada Importer: Separated finding bone chains and fixing leaf bone orientations...
Gaia Clary [Mon, 1 Dec 2014 19:31:42 +0000 (20:31 +0100)]
Collada Importer: Separated finding bone chains and fixing leaf bone orientations into 2 functions and added a separated import option

6 years agoFix for potential bug in paint brush RNA updates, was casting to wrong
Lukas Tönne [Mon, 1 Dec 2014 18:54:19 +0000 (19:54 +0100)]
Fix for potential bug in paint brush RNA updates, was casting to wrong
DNA type.

The update function is for the Paint struct, containing a Brush pointer
property, not Brush itself. Probably went fine so far because was only
used for a notifier pointer, but still ...