5 years agoFix compilation error with msvc2012 and 2013 as well
Sergey Sharybin [Fri, 31 Jan 2014 09:30:36 +0000 (15:30 +0600)]
Fix compilation error with msvc2012 and 2013 as well

5 years agoFix for T32843
gaiaclary [Fri, 31 Jan 2014 08:35:00 +0000 (09:35 +0100)]
Fix for T32843

Exported angles for spot size animation is in radians , however Collada expects it to be in degrees.
This patch is for fixing import and export, and also renaming a variable

Reviewers: gaiaclary

Reviewed By: gaiaclary

Differential Revision:

5 years agoEvents: fix for wmEvent prevx, prevy not updating
Campbell Barton [Thu, 30 Jan 2014 20:41:32 +0000 (07:41 +1100)]
Events: fix for wmEvent prevx, prevy not updating

5 years agoMore snapping fixes (this is ridiculous).
Bastien Montagne [Thu, 30 Jan 2014 17:48:49 +0000 (18:48 +0100)]
More snapping fixes (this is ridiculous).

I hope this time we are done!

5 years agoCode cleanup: remove BLI_has_parent
Campbell Barton [Thu, 30 Jan 2014 16:28:53 +0000 (03:28 +1100)]
Code cleanup: remove BLI_has_parent

5 years agoCode cleanup: add BLI_testextensie_n, replacing multuple calls to BLI_testextensie
Campbell Barton [Thu, 30 Jan 2014 16:09:01 +0000 (03:09 +1100)]
Code cleanup: add BLI_testextensie_n, replacing multuple calls to BLI_testextensie

also use attributes for BLI path functions

5 years agoFix T38409: Snapping Bug
Bastien Montagne [Thu, 30 Jan 2014 16:11:10 +0000 (17:11 +0100)]
Fix T38409: Snapping Bug

Issue partially caused by own errors (glicth in new BKE_boundbox_ray_hit_check() code causing segfault in volume snapping,
and we have to treat ortho and persp differently in case of face snapping, because in persp our ray_start might very well
already be *inside* the boundbox of the checked object), and partly due to the fact that ED_view3d_win_to_vector()
was returning wrong vector (negated one) for ortho views (see previous commit).

5 years agoFix a nice bug in ED_view3d_win_to_vector() - vector returned for an ortho view was...
Bastien Montagne [Thu, 30 Jan 2014 15:48:29 +0000 (16:48 +0100)]
Fix a nice bug in ED_view3d_win_to_vector() - vector returned for an ortho view was negated compared to vector returned for the same view in perspective...

Found while working on snapping issues, confirmed using bisect tool: previous to this commit, inner/outer parts were swapped when switching from otho to persp!

5 years agoFix for crash linking node groups through
Campbell Barton [Thu, 30 Jan 2014 13:53:02 +0000 (00:53 +1100)]
Fix for crash linking node groups through

Defer creating the Python objects until after appending is finished
because NodeTree's types are not initialized until then.

5 years agoFix T38403: Laplacian smooth on instanced objects leads to crash.
Lukas Tönne [Thu, 30 Jan 2014 12:06:48 +0000 (13:06 +0100)]
Fix T38403: Laplacian smooth on instanced objects leads to crash.

The laplacian modifiers (smooth and deform) use the OpenNL library,
which is not threadsafe due to the use of a global context variable.
Ideally this would be changed so that an explicit context can be
created for every caller of the OpenNL functions, but since OpenNL's
most recent version is from 2010 this is unlikely to happen.

As a workaround for now just use a mutex to prevent conflicting OpenNL
calls. Eventually OpenNL can be replaced by eigen or ceres.

5 years agoFix T38358: typo in own rB77089a3bf203.
Bastien Montagne [Thu, 30 Jan 2014 10:51:34 +0000 (11:51 +0100)]
Fix T38358: typo in own rB77089a3bf203.

Also allowed me to fine another potential issue, hit.dist was no more initialized correctly - and I had forgotten to take into account Brecht's remark about normalize_v3() also returning the vector's previous length.

5 years agoSmallhash: refactor and fixes
Campbell Barton [Thu, 30 Jan 2014 09:51:44 +0000 (20:51 +1100)]
Smallhash: refactor and fixes

- BLI_smallhash_remove didnt decrement total entries.
- rename vars to match closer to ghash.
- smallhash_lookup returns NULL when no entry found.
- using a zero value key wasn't supported.
- no need to memset or calloc bucket arrays
- add asserts for unsupported conditions.
- added BLI_smallhash_lookup_p

5 years agoPyAPI: noise.seed_set(), note that zero is a special case.
Campbell Barton [Thu, 30 Jan 2014 06:54:06 +0000 (17:54 +1100)]
PyAPI: noise.seed_set(), note that zero is a special case.

5 years agoFix T38402: invalid message for bad type assignments (Quat, Vector)
Campbell Barton [Thu, 30 Jan 2014 05:45:20 +0000 (16:45 +1100)]
Fix T38402: invalid message for bad type assignments (Quat, Vector)

5 years agoCode cleanup: remove (now) redundant empty text with icon_only
Campbell Barton [Thu, 30 Jan 2014 05:31:57 +0000 (16:31 +1100)]
Code cleanup: remove (now) redundant empty text with icon_only

5 years agoUI: move toggle icons out of layout checks into rna
Campbell Barton [Thu, 30 Jan 2014 05:24:51 +0000 (16:24 +1100)]
UI: move toggle icons out of layout checks into rna

5 years agoUI API: don't use a text label when icon_only is set
Campbell Barton [Thu, 30 Jan 2014 04:28:39 +0000 (15:28 +1100)]
UI API: don't use a text label when icon_only is set

5 years agoWarnings: quiet unused define message
Campbell Barton [Thu, 30 Jan 2014 04:26:22 +0000 (15:26 +1100)]
Warnings: quiet unused define message

5 years agoFix T38400: crash in image_listener accessing deleted object.
Brecht Van Lommel [Wed, 29 Jan 2014 19:28:18 +0000 (20:28 +0100)]
Fix T38400: crash in image_listener accessing deleted object.

Listeners should never dereference this pointer because the object may have
been deleted, it can only be used for comparisons.

5 years agoFix T38358: Face snapping fails on Orthographic view
Bastien Montagne [Wed, 29 Jan 2014 19:10:03 +0000 (20:10 +0100)]
Fix T38358: Face snapping fails on Orthographic view

Issue is caused by start point of ray used to detect faces under the mouse is set rather far away in ortho 3dviews.
The loss of precision on the ray location induced by this can lead to face snapping failures.

Solution is to do the raycasting with a temp start point, much closer to the object we check, and add back
to the found distance the diff to the real start point once detection is done (as we need all hit distances
from all tested objects to be relative to a common point!).

Note this commit only addresses the "face snapping on mesh" case, other kind of snapping do not seem to suffer
from this issue.

Reviewers: brecht, campbellbarton

Differential Revision:

5 years agoFix T37661: color ramps and curve mapping editing not disabled for linked data.
Brecht Van Lommel [Wed, 29 Jan 2014 18:02:32 +0000 (19:02 +0100)]
Fix T37661: color ramps and curve mapping editing not disabled for linked data.

5 years agoCode cleanup: remove redundant makesrna call with platform "linuxcross".
Lawrence D'Oliveiro [Wed, 29 Jan 2014 17:28:51 +0000 (18:28 +0100)]
Code cleanup: remove redundant makesrna call with platform "linuxcross".

Reviewed By: brecht

Differential Revision:

5 years agoFix accidental description change in recent commit.
Brecht Van Lommel [Wed, 29 Jan 2014 17:28:09 +0000 (18:28 +0100)]
Fix accidental description change in recent commit.

5 years agoFix bone transform issue where the bone roll depends on intermediate mouse positions.
Brecht Van Lommel [Wed, 29 Jan 2014 15:59:23 +0000 (16:59 +0100)]
Fix bone transform issue where the bone roll depends on intermediate mouse positions.

It computed the roll compatible with the previous mouse position roll value,
now it uses the initial roll value.

5 years agoUpdate Edit Mode tabs for mesh objects
Jonathan Williamson [Wed, 29 Jan 2014 15:53:20 +0000 (09:53 -0600)]
Update Edit Mode tabs for mesh objects

This greatly improves the mesh edit tabs after a few weeks of feedback, making the tabs more practical with less need to switch tabs often.  Based on discussion on IRC and T37568.

Reviewers: campbellbarton

CC: campbellbarton, brecht
Reviewers: campbellbarton

Reviewed By: campbellbarton

CC: campbellbarton, brecht
Differential Revision:

5 years agoFix T38359: incorrect display of material slot with pinned particle settings.
Brecht Van Lommel [Wed, 29 Jan 2014 15:50:37 +0000 (16:50 +0100)]
Fix T38359: incorrect display of material slot with pinned particle settings.

Just hide it in this case, the material slot is not really valid without an
object in the context.

5 years agoFix T36955: API docs referred to sys.maxint which does not exist in Python 3.
Brecht Van Lommel [Wed, 29 Jan 2014 15:49:12 +0000 (16:49 +0100)]
Fix T36955: API docs referred to sys.maxint which does not exist in Python 3.

5 years agoFix T37038: user preferences > input category names unnecessarily cut off.
Brecht Van Lommel [Wed, 29 Jan 2014 15:36:42 +0000 (16:36 +0100)]
Fix T37038: user preferences > input category names unnecessarily cut off.

5 years agoFix T38393: bone roll not restored properly after cancelling rotation of bones.
Brecht Van Lommel [Wed, 29 Jan 2014 15:11:34 +0000 (16:11 +0100)]
Fix T38393: bone roll not restored properly after cancelling rotation of bones.

5 years agorenamed unclear API parameter
gaiaclary [Wed, 29 Jan 2014 14:37:02 +0000 (15:37 +0100)]
renamed unclear API parameter

5 years agoFix T38388: Creating a new scene with full copy sets rigidbody collision shapes to...
Sergej Reich [Wed, 29 Jan 2014 14:02:45 +0000 (15:02 +0100)]
Fix T38388: Creating a new scene with full copy sets rigidbody collision shapes to box.

Tweak world rebuilding logic, so it's not done before object data was

5 years agoFix sconscript syntax error when using python 2.x instead of 3.x.
Brecht Van Lommel [Wed, 29 Jan 2014 13:50:20 +0000 (14:50 +0100)]
Fix sconscript syntax error when using python 2.x instead of 3.x.

5 years agoScons: Some tweaks for f70d9660474c, we don't need SSE41 kernel for 32bit, nor vc2008...
Thomas Dinges [Wed, 29 Jan 2014 12:29:06 +0000 (13:29 +0100)]
Scons: Some tweaks for f70d9660474c, we don't need SSE41 kernel for 32bit, nor vc2008 x64.

5 years agoUI: Make "Lock Interface" a icon only button and pack into the Display row, we don...
Thomas Dinges [Wed, 29 Jan 2014 12:27:33 +0000 (13:27 +0100)]
UI: Make "Lock Interface" a icon only button and pack into the Display row, we don't need a dedicated row for this option, also it looked quite bad for Cycles.

5 years agoUI: minor optimization for button lookup, break early when button found
Campbell Barton [Wed, 29 Jan 2014 12:04:20 +0000 (23:04 +1100)]
UI: minor optimization for button lookup, break early when button found

also reduce int/float conversion

5 years agoMove depsgraph debug print under --debug-depsgraph command line argument
Sergey Sharybin [Wed, 29 Jan 2014 11:37:45 +0000 (17:37 +0600)]
Move depsgraph debug print under --debug-depsgraph command line argument

5 years agoOption to lock the interface while rendering
Sergey Sharybin [Wed, 29 Jan 2014 10:07:14 +0000 (16:07 +0600)]
Option to lock the interface while rendering

Added function called WM_set_locked_interface which does
two things:

- Prevents event queue from being handled, so no operators
  (see below) or values are even possible to run or change.
  This prevents any kind of "destructive" action performed
  from user while rendering.

- Locks interface refresh for regions which does have lock
  set to truth in their template. Currently it's just a 3D
  viewport, but in the future more regions could be considered
  unsafe, or we could want to lock different parts of
  interface when doing different jobs.

  This is needed because 3D viewport could be using or changing
  the same data as renderer currently uses, leading to threading

  Notifiers are still allowed to handle, so render progress is
  seen on the screen, but would need to doublecheck on this, in
  terms some notifiers could be changing the data.

  For now interface locking happens for render job only in case
  "Lock Interface" checkbox is enabled.

  Other tools like backing would also benefit of this option.

  It is possible to mark operator as safe to be used in locked
  interface mode by adding OPTYPE_ALLOW_LOCKED bit to operator
  template flags.

  This bit is completely handled by wm_evem_system, not
  with operator run routines, so it's still possible to
  run operators from drivers and handlers.

  Currently allowed image editor navigation and zooming.

Reviewers: brecht, campbellbarton

Reviewed By: campbellbarton

Differential Revision:

5 years agoUI: Refactor timecode functions into BLI_timecode
Campbell Barton [Wed, 29 Jan 2014 09:01:30 +0000 (20:01 +1100)]
UI: Refactor timecode functions into BLI_timecode

- deduplicate timecode_simple_string from image.c
- avoid possible buffer overflow bugs (sprintf -> BLI_snprintf)
- remove option not to use timecode and split into 2 functions

Patch D227 by Andrew Buttery with own refactoring.

5 years agoScons: refactor cycles kernel code to avoid building the AVX kernel with
Brecht Van Lommel [Tue, 28 Jan 2014 21:56:12 +0000 (22:56 +0100)]
Scons: refactor cycles kernel code to avoid building the AVX kernel with
compilers that don't support it.

CMake still needs to updated to work the same for consistency, but this should
fix the OS X buildbot at least.

5 years agoFix T37999: incorrect windows size with Visual Studio 2013 builds.
Brecht Van Lommel [Tue, 28 Jan 2014 20:35:55 +0000 (21:35 +0100)]
Fix T37999: incorrect windows size with Visual Studio 2013 builds.

This is a known bug in Windows, now work around it.

5 years agoRNA: add rna_space_api.c for space functions
Campbell Barton [Tue, 28 Jan 2014 20:30:42 +0000 (07:30 +1100)]
RNA: add rna_space_api.c for space functions

5 years agoFile Reading: add revert operator
Campbell Barton [Tue, 28 Jan 2014 18:34:57 +0000 (05:34 +1100)]
File Reading: add revert operator

Patch D247 by Evans Jahja with edits

5 years agoFile Reading: add wrapper function for WM_file_read
Campbell Barton [Tue, 28 Jan 2014 18:33:05 +0000 (05:33 +1100)]
File Reading: add wrapper function for WM_file_read

also return cancelled when an operator fails to load a file

5 years agoBevel: fix glitch in "pipe" case with square profile.
Howard Trickey [Tue, 28 Jan 2014 18:18:43 +0000 (13:18 -0500)]
Bevel: fix glitch in "pipe" case with square profile.

The "pipe" case -- where two beveled edges are in line
and there is at least one more beveled edge -- needed better
handling when profile parameter = 1.0 (square outward).

5 years agoCuda use streams and async to avoid busywaiting
Martijn Berger [Tue, 28 Jan 2014 17:40:08 +0000 (18:40 +0100)]
Cuda use streams and async to avoid busywaiting

This is my first stab at this and is based on this IRC converstation:

<mib2berlin> brecht: this is meaning as reminder only, I know you have other things to do >
<brecht> mib2berlin: thanks, bookmarked

only tested on Ubuntu 14.04 / cuda 5.0 but ill do some more testing tomorrow.

Also unsure about the placement and the lifetime of the stream and the event. But creating / deleting these seems to incur a non trivial cost.

Reviewers: brecht

Reviewed By: brecht

CC: mib2berlin, dingto
Differential Revision:

5 years agoFix T38383: glitch drawing inactive slider
Campbell Barton [Tue, 28 Jan 2014 17:10:39 +0000 (04:10 +1100)]
Fix T38383: glitch drawing inactive slider

5 years agoViewport Drawing: apply matcaps to all objects
Campbell Barton [Tue, 28 Jan 2014 16:39:19 +0000 (03:39 +1100)]
Viewport Drawing: apply matcaps to all objects

5 years agoCode cleanup: remove check for painting non-mesh objects (its impossible)
Campbell Barton [Tue, 28 Jan 2014 16:38:07 +0000 (03:38 +1100)]
Code cleanup: remove check for painting non-mesh objects (its impossible)

5 years agoFix unused variable in the right way
Sergey Sharybin [Tue, 28 Jan 2014 16:14:50 +0000 (22:14 +0600)]
Fix unused variable in the right way

It IS to be used :)

5 years agoCode cleanup: unused var
Campbell Barton [Tue, 28 Jan 2014 15:55:27 +0000 (02:55 +1100)]
Code cleanup: unused var

5 years agoFix T38367: operators activated from popups didnt reuse settings
Campbell Barton [Tue, 28 Jan 2014 15:52:06 +0000 (02:52 +1100)]
Fix T38367: operators activated from popups didnt reuse settings

5 years agoCode cleanup: pep8
Campbell Barton [Tue, 28 Jan 2014 15:16:16 +0000 (02:16 +1100)]
Code cleanup: pep8

5 years agoFix T38381, Fix T38184: key events getting lost when modal operator is running.
Brecht Van Lommel [Tue, 28 Jan 2014 14:52:20 +0000 (15:52 +0100)]
Fix T38381, Fix T38184: key events getting lost when modal operator is running.

There is a hack for modal keymaps and double click events, which was (ab)using
the wmEvent.prevval variable to temporarily assign it KM_DBL_CLICK indicating
that the double click event was disabled. However the value of prevval can
actually be KM_DBL_CLICK in other circumstances too, which caused a key press
event to get converted to a double click event.

5 years agoFix for a typo reported by flokkievids through code review comments D163#1.
Tamito Kajiyama [Thu, 2 Jan 2014 01:19:50 +0000 (10:19 +0900)]
Fix for a typo reported by flokkievids through code review comments D163#1.

5 years agoMoved the Operators class from the 'freestyle' module to the 'freestyle.types' submodule.
Tamito Kajiyama [Mon, 30 Dec 2013 14:43:47 +0000 (23:43 +0900)]
Moved the Operators class from the 'freestyle' module to the 'freestyle.types' submodule.

5 years agoPatch set by Folkert Vries (flokkievids) with respect to (F32402).
Tamito Kajiyama [Mon, 30 Dec 2013 14:26:31 +0000 (23:26 +0900)]
Patch set by Folkert Vries (flokkievids) with respect to (F32402).
Applied with minor modifications.

5 years agoFix for a missing submodule in the top-level 'freestyle' module package.
Tamito Kajiyama [Thu, 5 Dec 2013 22:26:37 +0000 (22:26 +0000)]
Fix for a missing submodule in the top-level 'freestyle' module package.
Reported by flokkievids, thanks!

5 years agoUpdated Freestyle API modules according to the new hierarchical package structure.
Tamito Kajiyama [Sun, 24 Nov 2013 22:18:38 +0000 (22:18 +0000)]
Updated Freestyle API modules according to the new hierarchical package structure.

Additional bug fixes were also done along with the code updates:
* Fix for the use of old Interface1D.pointsBegin() and .pointsEnd() method names
in the definition of pyDensityAnisotropyF1D and pyViewMapGradientNormF1D.
* Fix for wrong data types (int instead of bool) for:
- pyChainSilhouetteGenericIterator constructor and its .orientation property in
- SpatialNoiseShader constructor in styles/
- ChainSilhouetteIterator constructor in styles/

5 years agoReorganized the Freestyle Python API in a hierarchical package structure.
Tamito Kajiyama [Sun, 24 Nov 2013 00:28:01 +0000 (00:28 +0000)]
Reorganized the Freestyle Python API in a hierarchical package structure.

Both C- and Python-coded API components were rearranged into logical groups.
New Python modules are packaged as follows:

freestyle - Top-level package
freestyle.types - Classes for core data structues (e.g., view map)
freestyle.chainingiterators - Pre-defined chaining iterators
freestyle.functions - Pre-defined 0D and 1D functions
freestyle.predicates - Pre-defined 0D and 1D predicates
freestyle.shaders - Pre-defined stroke shaders
freestyle.utils - Utility functions

The Python modules are installed in scripts/freestyle/modules.  Pre-defined
styles are installed in scripts/freestyle/styles.

To-do: update styles according to the new Freestyle API package structure.

5 years agoBundle latest Libmv from upstream
Sergey Sharybin [Tue, 28 Jan 2014 12:35:46 +0000 (18:35 +0600)]
Bundle latest Libmv from upstream

Currently no functional changes, but we might want
to have scoped_array in the future.

5 years agoBevel code cleanup: get rid of old 'ADJ' code.
Howard Trickey [Tue, 28 Jan 2014 12:01:55 +0000 (07:01 -0500)]
Bevel code cleanup: get rid of old 'ADJ' code.

The new subdiv 'adj' pattern is working well, so removing the
old code and taking opportunity to remove 'subdiv' from a number
of names.

5 years agoFollowup to the previous commit
Sergey Sharybin [Tue, 28 Jan 2014 12:01:03 +0000 (18:01 +0600)]
Followup to the previous commit

Need to take weight into account when drawing per-frame track
reprojection curve and when computing per-track average error.

5 years agoCode cleanup: remove references to svn and code style
Campbell Barton [Tue, 28 Jan 2014 12:00:28 +0000 (23:00 +1100)]
Code cleanup: remove references to svn and code style

5 years agoImprovements to weighted tracks behavior
Sergey Sharybin [Tue, 28 Jan 2014 11:25:47 +0000 (17:25 +0600)]
Improvements to weighted tracks behavior

First thing changed by this commit is making it so
Euclidean intersection takes track weight into account
when solving minimization problem. This behaves the
same exact way as it is for BA step.

Second thing is related on how average reprojection error
is being calculated. It didn't take track weight into
account which could confuse users. Now average reprojection
error will give the same result as intersection/BA uses
during minimization which gives much more predictable

Differential Revision:

5 years agoFixes for keyframe selection
Sergey Sharybin [Tue, 28 Jan 2014 10:50:04 +0000 (16:50 +0600)]
Fixes for keyframe selection

Using tracks with constant zero weight used to crash
keyframe selection since it was trying to use missing
parameter blocks for Jacobian evaluation,

Also fixed possible issues with wrong camera block being
marked as variable. This could technically happen when
having zero weighted tracks. Made it so all camera blocks
are marked as variable for now.

5 years agoTheme: update ubuntu and blender2.4x tab colors
Campbell Barton [Tue, 28 Jan 2014 10:48:01 +0000 (21:48 +1100)]
Theme: update ubuntu and blender2.4x tab colors

5 years agoRework detector API and implement Harris detector
Sergey Sharybin [Tue, 8 Oct 2013 13:53:59 +0000 (19:53 +0600)]
Rework detector API and implement Harris detector

Switch the detector API to a single function which accepts
a float image and detector options. This makes usage of
feature detection more unified across different algorithms.

Options structure is pretty much straightforward and contains
detector to be used and all the detector-specific settings.

Also implemented Harris feature detection algorithm which
is not as fast as FAST one but is expected to detect more
robust feature points. It is also likely that less features
are detected, but better quality than quantity.

Blender will now use Harris detector by default, later we'll
remove FAST detector.

5 years agoCompilation fix for SCons
Sergey Sharybin [Tue, 28 Jan 2014 09:14:00 +0000 (15:14 +0600)]
Compilation fix for SCons

Was broken by recent FFmpeg changes.

5 years agoCode cleanup: more preprocessor indentation
Sergey Sharybin [Tue, 28 Jan 2014 08:34:52 +0000 (14:34 +0600)]
Code cleanup: more preprocessor indentation

5 years agoCode cleanup: indentation of interior preprocessor
Sergey Sharybin [Tue, 28 Jan 2014 08:33:42 +0000 (14:33 +0600)]
Code cleanup: indentation of interior preprocessor

5 years agoaudaspace: use new libavcodec audio encoding API where available
Anton Khirnov [Sun, 26 Jan 2014 12:22:26 +0000 (13:22 +0100)]
audaspace: use new libavcodec audio encoding API where available

5 years agolibavformat API usage: use avformat_close_input() instead of av_close_input_file()
Anton Khirnov [Thu, 16 Jan 2014 14:40:37 +0000 (15:40 +0100)]
libavformat API usage: use avformat_close_input() instead of av_close_input_file()

5 years agolibavformat API usage: use avg_frame_rate instead of r_frame_rate
Anton Khirnov [Thu, 16 Jan 2014 14:40:37 +0000 (15:40 +0100)]
libavformat API usage: use avg_frame_rate instead of r_frame_rate

r_frame_rate is a guessed number defined as "the least common multiple of
all framerates in the stream". It has been deprecated and removed in new
Libav releases.

Use avg_frame_rate instead, which is the average framerate of the

5 years agolibavcodec API usage: use new video encoding API
Anton Khirnov [Thu, 16 Jan 2014 14:40:37 +0000 (15:40 +0100)]
libavcodec API usage: use new video encoding API

avcodec_encode_video() has been replaced with avcodec_encode_video2()
in new libavcodec versions.

5 years agoChange libavcodec CODEC_ID_* to AV_CODEC_ID_*
Anton Khirnov [Thu, 16 Jan 2014 14:40:37 +0000 (15:40 +0100)]
Change libavcodec CODEC_ID_* to AV_CODEC_ID_*

CODEC_ID_* have been replaced with AV_CODEC_ID_* in new libavcodec

Update the code to use those new identifiers.

Added a compatibility code to ffmpeg_compat.h

5 years agoFix T37673: Ray casting could fail with 0 collision margins
Sergej Reich [Tue, 28 Jan 2014 07:26:51 +0000 (08:26 +0100)]
Fix T37673: Ray casting could fail with 0 collision margins

Use bullet's old method of doing ray casts to stay compatible with old
files. It's faster but a bit less accurate.

5 years agoBGE: remove freestyle from stubs, all functions were out of use
Campbell Barton [Tue, 28 Jan 2014 06:59:00 +0000 (17:59 +1100)]
BGE: remove freestyle from stubs, all functions were out of use

5 years agoIdentified the freestyle stubs breaking pragma GCC diagnostic error "-Wmissing-protot...
Jens Verwiebe [Mon, 27 Jan 2014 22:00:55 +0000 (23:00 +0100)]
Identified the freestyle stubs breaking pragma GCC diagnostic error "-Wmissing-prototypes”, diasabling this case for now

5 years agoCorrect typo in the patch file as well
Sergey Sharybin [Mon, 27 Jan 2014 20:16:44 +0000 (02:16 +0600)]
Correct typo in the patch file as well

5 years agoFix compilation on Windows, syntax error.
Thomas Dinges [Mon, 27 Jan 2014 19:53:42 +0000 (20:53 +0100)]
Fix compilation on Windows, syntax error.

5 years agoOSX/scons: fix own error in last commit and do a cleanup
Jens Verwiebe [Mon, 27 Jan 2014 19:39:09 +0000 (20:39 +0100)]
OSX/scons: fix own error in last commit and do a cleanup

5 years agoAttempt to fix compilation error with MSVC-2008
Sergey Sharybin [Mon, 27 Jan 2014 19:36:49 +0000 (01:36 +0600)]
Attempt to fix compilation error with MSVC-2008

5 years agoRevert the removal of Blender Internal Edge rendering, after artist feedback.
Thomas Dinges [Mon, 27 Jan 2014 18:58:54 +0000 (19:58 +0100)]
Revert the removal of Blender Internal Edge rendering, after artist feedback.

This reverts commit fb91a602c756f3ee5a122efa1862b8be7604186b.

5 years agoOSX/scons: consequently make use of the recently introduced C_COMPILER_ID and CCVERS...
Jens Verwiebe [Mon, 27 Jan 2014 18:56:15 +0000 (19:56 +0100)]
OSX/scons: consequently make use of the recently introduced C_COMPILER_ID and  CCVERSION env vars

5 years agoOSX/scons: fix gnu gcc compile by using clang assembler ( openMP builds)
Jens Verwiebe [Mon, 27 Jan 2014 18:46:05 +0000 (19:46 +0100)]
OSX/scons: fix gnu gcc compile by using clang assembler ( openMP builds)

5 years agoFix player compile in scons and disable -Wmissing-prototypes for Apple atm.
Jens Verwiebe [Mon, 27 Jan 2014 18:36:05 +0000 (19:36 +0100)]
Fix player compile in scons and disable -Wmissing-prototypes for Apple atm.

5 years agoRevert recent OpenEXR cmake/linux fix and earlier OS X fix to use GCC for AVX.
Brecht Van Lommel [Mon, 27 Jan 2014 18:11:36 +0000 (19:11 +0100)]
Revert recent OpenEXR cmake/linux fix and earlier OS X fix to use GCC for AVX.

Both need a better solution and break working builds.

5 years agoCode cleanup: use booleans where appropriate
Campbell Barton [Mon, 27 Jan 2014 16:52:21 +0000 (03:52 +1100)]
Code cleanup: use booleans where appropriate

5 years agoBuildbot OS X: compile with clang instead of GCC.
Brecht Van Lommel [Mon, 27 Jan 2014 16:14:16 +0000 (17:14 +0100)]
Buildbot OS X: compile with clang instead of GCC.

This should solve the missing -mavx option for Cycles, and also give better
performance since GCC 4.2 is now 5 years old already.

5 years agoUse includes for blenderplayer stubs
Campbell Barton [Mon, 27 Jan 2014 14:55:10 +0000 (01:55 +1100)]
Use includes for blenderplayer stubs

exposes many incorrect and redundant stubs

5 years agoFix incorrect extern
Campbell Barton [Mon, 27 Jan 2014 14:50:09 +0000 (01:50 +1100)]
Fix incorrect extern

5 years agoAttempt to fix T38373: cmake linux build failure with OpenEXR.
Brecht Van Lommel [Mon, 27 Jan 2014 14:25:22 +0000 (15:25 +0100)]
Attempt to fix T38373: cmake linux build failure with OpenEXR.

5 years agoFix T38355: Crash with Shader Node Group with missing datablock,
Lukas Tönne [Mon, 27 Jan 2014 11:26:49 +0000 (12:26 +0100)]
Fix T38355: Crash with Shader Node Group with missing datablock,
only in "Material" viewport shading.

5 years agoUpdate Carve to latest update
Sergey Sharybin [Mon, 27 Jan 2014 11:00:05 +0000 (17:00 +0600)]
Update Carve to latest update

Fixes some issues with NaN vertices in special cases.
Also adds edge interpolation routines which are currently
unused but which are requires to implement edge CD interpolation.

5 years agopatch by liblib (lid b)
Martijn Berger [Mon, 27 Jan 2014 10:42:38 +0000 (11:42 +0100)]
patch by liblib (lid b)

Default installation path of cuda nvcc.exe contain spaces

Reviewers: juicyfruit

Differential Revision:

5 years agoImplement clipboard for mask splines
Sergey Sharybin [Mon, 27 Jan 2014 09:41:16 +0000 (15:41 +0600)]
Implement clipboard for mask splines

So now it's possible to copy-paste splines between layers.

Implementation is pretty much straightforward and duplicates
some logic which we've got in sequencer/tracking clipboards.

Will work on a common routine for clipboards later, for now
it's not so much crucial to have.

5 years agoCode Cleanup: de-duplicate nested node tree checking
Campbell Barton [Mon, 27 Jan 2014 09:17:56 +0000 (20:17 +1100)]
Code Cleanup: de-duplicate nested node tree checking

5 years agoFix clip editor interface being broken by a71f072
Sergey Sharybin [Mon, 27 Jan 2014 09:10:08 +0000 (15:10 +0600)]
Fix clip editor interface being broken by a71f072

Please do test commits before committing them.
This is second working day in a row which was started with
solving issues caused by untested patches.

5 years agopatch by Mihai Melinescu: boost hardcoded MSVC12
Martijn Berger [Mon, 27 Jan 2014 08:24:44 +0000 (09:24 +0100)]
patch by Mihai Melinescu: boost hardcoded MSVC12

Updated CMakeLists.txt to account for boost hardcoded locations for VS 2013.

Reviewers: juicyfruit

Differential Revision:

5 years agoUI: Fix for icon-only menus too small click-able area
Campbell Barton [Mon, 27 Jan 2014 08:10:53 +0000 (19:10 +1100)]
UI: Fix for icon-only menus too small click-able area