Commit Graph

46803 Commits

Author SHA1 Message Date
Thomas Dinges
95080ea5cd Freestyle / Scons:
* Changes in tools\Blender.py were not merged, causing compile failure.
2013-04-06 22:21:42 +00:00
Dan Eicher
89863f78a9 Whoops, revert r55854 and use r48292 as is
Turns out outliner_search_back() doesn't always return a valid scene...
2013-04-06 21:48:39 +00:00
Dan Eicher
c3725021ab Clicking on an outliner object in an unselected scene switches to the scene but doesn't set it as the active object
Based on commit soc-2012-bratwurst:r48292 by Jorge Rodriquez
2013-04-06 21:37:35 +00:00
Tamito Kajiyama
ba1dc9b1b0 Fix for a heap-use-after-free issue, reported by Lockal in the IRC. 2013-04-06 19:42:58 +00:00
Jens Verwiebe
be2626f9f4 Fix freestyle compile with scons 2013-04-06 18:06:06 +00:00
Tamito Kajiyama
464a149b21 Part I of the Freestyle branch merger: new 'freestyle' folders.
This commit is the first part of a two-part merger of the soc-2008-mxcurioni
(Freestyle) branch.  New 'freestyle' folders were added to the source/blender/
and release/script/ directories through a couple of svn copy operations
(instead of svn merge, due to broken svn:mergeinfo properties of the branch).
2013-04-06 15:45:02 +00:00
Sergey Sharybin
f62d2669de Revert change made to bilinear sampler in libmv
This made preview working but that broke internals
of tracking.

Namely, BlurredImageAndDerivativesChannels is giving
much more blurred image because it was assuming pixel
center is an integer position.

Guess other parts of libmv used to suffer because of
this issue.

Now pixel centering happens in blender side, and
libmv assumes integer position is a pixel center.
2013-04-06 14:47:45 +00:00
Tamito Kajiyama
4c16d3e231 Pre-merger changes.
Deprecated Freestyle-specific elements were removed from the code base,
in order to address all comments from branch code reviews.
https://codereview.appspot.com/7416049/

Backward compatibility won't be maintained in the following components:

- Freestyle edge/face marks in old .blend files are ignored.

Old .blend files can be converted by loading and saving the files using
a Freestyle branch build between revision 55581 and 55842.

- External style modules are no longer supported.

Instead text datablocks must be used to keep style module files within
.blend files.  A branch build between revision 55741 and 55842 is useful
for identifying the style module file names that need reconfiguring.
2013-04-06 14:45:50 +00:00
Sergey Sharybin
acfc0ea511 svn merge ^/trunk/blender -r55815:55840 2013-04-06 13:24:34 +00:00
Thomas Dinges
2ed2226ee7 Node UI:
* After PyNodes merge, many node sockets had sliders, instead of the arrow buttons (as the PROP_FACTOR subtype now actually was used). Change those back now, after artists feedback.
2013-04-06 12:07:42 +00:00
Gaia Clary
92b6365e21 fix: #34871 Cycles/CUDA/sm_35: Build problems probably due to issues with float3 operators (on windows?) 2013-04-06 11:52:40 +00:00
Gaia Clary
2d76a828ca Fix: 34874 Weight Paint UI inconsistent: removed conflicting shortcut definition, added weight assign tools to specials menu 2013-04-06 10:52:52 +00:00
Campbell Barton
129f401228 ctrl+a select all in button field 2013-04-06 08:22:39 +00:00
Tamito Kajiyama
72d0cc1f61 Minor white space fix. 2013-04-06 07:53:57 +00:00
Tamito Kajiyama
4ff8041e0e Removed Freestyle-specific code from DerivedMesh.c.
The removed code was necessary due to a logical bug in the use of CD_ORIGINDEX
layer entries.  Previously the index values were used to refer to the edges/polys
of the derived mesh, assuming that the derived mesh edges/polys consisted of those
from the original mesh plus newly added edges/polys.  This assumption was not
correct, although it worked well for several modifiers such as Mirror and Solidify.
Now the index values are specifically used to reference the edge/polys of the
original mesh.
2013-04-06 06:09:08 +00:00
Campbell Barton
6002927521 add relative offset option for poke tool. 2013-04-06 03:03:37 +00:00
Campbell Barton
1d5f988778 patch [#34890] BMesh Poke Face.
by Francisco De La Cruz (xercesblue), with some of my own changes/improvements.

Converts faces to triangle-fans (useful to run on ngons).

To access select a group of faces and press "Alt+P" or alternatively select the operator from the Faces menu (Ctrl+F)
2013-04-06 02:45:43 +00:00
Brecht Van Lommel
cf3ec257a2 Fix #34880: cycles motion blur render issue with some compilers. Actually is a bigger
problem where accessing float4 members with [] stops working due to optimizer, will
check that later.
2013-04-05 23:03:10 +00:00
Campbell Barton
bb81923c3e bmesh operator rename inset -> inset_region 2013-04-05 22:56:01 +00:00
Campbell Barton
8fd42b2aae patch [#34886] BMesh Individual Face Inset
from Francisco De La Cruz (xercesblue) with some simplifications to the patch.
2013-04-05 22:21:14 +00:00
Campbell Barton
716ed32d90 fix [#34870] bmesh.ops.* parameter lists and descriptions don't show in PyConsole on auto-complete
more a feature request then a bug but nice to have __doc__ on bmesh operators.
2013-04-05 19:58:18 +00:00
Tamito Kajiyama
b4bd232da0 Removed CD_MASK_FREESTYLE_EDGE and CD_MASK_FREESTYLE_FACE from CD_MASK_BAREMESH
and moved them to init_render_mesh() in convertblender.c where these CustomData
layers are specifically required.
2013-04-05 19:34:26 +00:00
Campbell Barton
79e58c31a0 add BM_face_calc_center_mean_weighted() gives much better result at cost of some speed. 2013-04-05 19:26:33 +00:00
Brecht Van Lommel
7404c1a553 Fix another part of #34877: cycles progress status text not showing correct with
per render layer samples in addition to the progress bar.

Also fixed job progress bar not working at all on high DPI / retina, was so small
the actual progress was not visible.
2013-04-05 17:57:26 +00:00
Campbell Barton
93ac968db3 code cleanup: include order 2013-04-05 17:56:54 +00:00
Sergey Sharybin
5f49bab8ba Fix eternal compo refresh when having image editor with mask opened
This was a regression since 55719 and the reason is:

- image_refresh() will tag combo for re-calc when editing mask.
  This is a feature, so you could have immediate feedback on masking
  and compositing while editing mask. This is done from image_refresh().

- Color management sends NC_WINDOW notifier, so the whole window is
  updated when changing color management settings. Image editor used
  to refresh space when this notifier is sent.

  The same notifier is sent by compositor job to redraw all possible
  viewers.

Simple fix: don't refresh image space for NC_WINDOW, there's nothing
in image_refresh() which we would want to happen on NC_WINDOW event.
2013-04-05 17:27:25 +00:00
Ton Roosendaal
b18a7c3cd6 Bug fix #34866
Global undo/redo now clears the local undo editmode stack entirely.

Error goes back to the 2.3 days, when undo was added.

Global undo refreshes the entire internal database, so all ID pointers get invalid.
This cases editmode undo storage to fail, if it uses ID pointers as well.

The error was that for any Mesh undo stack, a single global undo would make the
mesh stack corrupt. Back in edit mode, on undo you'd lose assigned texture images, 
or get bad crashes.

The downside is that people expect this to work... it's a fun feature to maintain
stacks separately. Having this instable is not acceptable though. Needs quite some
redesign work to solve it (like Dalai's kill-the-tface project :)
2013-04-05 17:10:28 +00:00
Thomas Dinges
5e0cdd6473 Code cleanup / Cycles / Object Attributes:
* Change some long "else if" conditions into switch case.
2013-04-05 17:03:59 +00:00
Sergey Sharybin
394a45a645 Fix #34877: The render status feedback (progress bar) does not take into account specific Renderlayer samples 2013-04-05 16:59:19 +00:00
Campbell Barton
002dbaece7 style cleanup 2013-04-05 16:55:12 +00:00
Tamito Kajiyama
fabbc5b1fa White space fixes (to make a diff from the trunk cleaner). 2013-04-05 16:53:24 +00:00
Brecht Van Lommel
3863e72c73 Fix #34679: cycles image texture alpha fringes. New rule is now that color output
will not give straight RGB values if the alpha output is used, so that mixing with
a transparent BSDF gives the correct result.
2013-04-05 16:43:53 +00:00
Antony Riakiotakis
eb11b590a8 Keep brush overlays below panels in triple buffer mode. 2013-04-05 16:34:27 +00:00
Campbell Barton
01a87fe1b9 svn merge ^/trunk/blender -r55813:55815 2013-04-05 16:27:39 +00:00
Campbell Barton
cf76d73b83 code cleanup: quiet some warnings and style 2013-04-05 15:45:10 +00:00
Campbell Barton
89926a0598 svn merge ^/trunk/blender -r55776:55813 2013-04-05 15:42:31 +00:00
Campbell Barton
12981b0048 fix [#34881] Bad characters in error output (PyConsole) if trying to use a Bmesh UV Layer on a BMVert 2013-04-05 15:09:25 +00:00
Campbell Barton
1c3c4f3954 code cleanup: use bool's for vgroup and editmode. 2013-04-05 14:58:30 +00:00
Bastien Montagne
d070940192 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. 2013-04-05 13:34:32 +00:00
Antony Riakiotakis
5ad071633f 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!
2013-04-05 13:00:16 +00:00
Bastien Montagne
4cfffd863b 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... :/).
2013-04-05 12:37:48 +00:00
Antony Riakiotakis
81621eb696 Patch from kgeogeo:
* Change coordinates of stencil to float, helps with precision during
property manuipulations
* Expose stencil properties to RNA.
2013-04-05 11:45:33 +00:00
Lukas Toenne
b31ca01357 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. 2013-04-05 11:16:06 +00:00
Sergey Sharybin
e579400d92 Fixed typo in OCIO GLSL module, was using address to a pointer.. 2013-04-05 11:10:59 +00:00
Lukas Toenne
7fbebe6702 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. 2013-04-05 11:02:32 +00:00
Sergey Sharybin
a53a106065 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.
2013-04-05 11:01:35 +00:00
Sergey Sharybin
898ba93a12 Update libmv to current upstream version
- Solves some strict compilation warning
- Style/code cleanup
2013-04-05 09:23:20 +00:00
Sergey Sharybin
43b61fb8bd 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.
2013-04-05 09:22:54 +00:00
Miika Hamalainen
a00b72bc75 Fix [#34857]: Negative temp.diff. in a smoke simulation doesn't work. 2013-04-05 07:56:59 +00:00
Sergey Sharybin
aabc999c17 Apparently, you shall not define variables in the middle of the block 2013-04-05 06:50:59 +00:00