Commits

Author Commit Message Labels Comments Date
Dean Giberson
Merge remote-tracking branch 'upstream/master'
gsrb3d
SVN maintenance. git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55860 954f8c5b-7b00-dc11-b283-0030488c597c
dingto
Code cleanup: * Remove commented C code from properties_render_layer.py git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55859 954f8c5b-7b00-dc11-b283-0030488c597c
dingto
Properties Editor / Render Layers: * Cycles Render layers UI was broken after freestyle merge (changes were not merged). Did manual edits now with some tweaks. * Some layout fixes for Mask Layer. git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55858 954f8c5b-7b00-dc11-b283-0030488c597c
gaiaclary
fix: display weight brush strength widget only in weight paint mode git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55857 954f8c5b-7b00-dc11-b283-0030488c597c
dingto
Freestyle / Scons: * Changes in tools\Blender.py were not merged, causing compile failure. git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55856 954f8c5b-7b00-dc11-b283-0030488c597c
dna
Whoops, revert r55854 and use r48292 as is Turns out outliner_search_back() doesn't always return a valid scene... git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55855 954f8c5b-7b00-dc11-b283-0030488c597c
dna
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 git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55854 954f8c5b-7b00-dc11-b283-0030488c597c
kjym3
Fix for a heap-use-after-free issue, reported by Lockal in the IRC. git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55852 954f8c5b-7b00-dc11-b283-0030488c597c
jensverwiebe
Fix freestyle compile with scons git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55851 954f8c5b-7b00-dc11-b283-0030488c597c
kjym3
Removed unnecessary file (looks like included by accident). git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55850 954f8c5b-7b00-dc11-b283-0030488c597c
kjym3
Additional missing files in revision 55847... git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55849 954f8c5b-7b00-dc11-b283-0030488c597c
kjym3
Missing files in revision 55847. git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55848 954f8c5b-7b00-dc11-b283-0030488c597c
kjym3
Part II of the Freestyle branch merger: modifications to the trunk code base. This commit concludes the two-part merger of the soc-2008-mxcurioni (Freestyle) branch started in revision 55846. A number of modifications and additions has been made to the trunk code base to integrate the Freestyle non-photorealistic (NPR) renderer into Blender. All the changes in this commit were made by applying a diff from the branch to the trunk (instead of svn merge, due to broken svn:me…
kjym3
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). git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55846 954f8c5b-7b00-dc11-b283-00…
nazgul
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. git-svn-id: https://svn.blende…
dingto
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. git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55840 954f8c5b-7b00-dc11-b283-0030488c597c
gaiaclary
fix: #34871 Cycles/CUDA/sm_35: Build problems probably due to issues with float3 operators (on windows?) git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55839 954f8c5b-7b00-dc11-b283-0030488c597c
gaiaclary
Fix: 34874 Weight Paint UI inconsistent: removed conflicting shortcut definition, added weight assign tools to specials menu git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55838 954f8c5b-7b00-dc11-b283-0030488c597c
campbellbarton
ctrl+a select all in button field git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55837 954f8c5b-7b00-dc11-b283-0030488c597c
campbellbarton
add relative offset option for poke tool. git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55834 954f8c5b-7b00-dc11-b283-0030488c597c
campbellbarton
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) git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55833 954f8c5b-7b00-dc11-b283-0030488c597c
blendix
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. git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55832 954f8c5b-7b00-dc11-b283-0030488c597c
campbellbarton
bmesh operator rename inset -> inset_region git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55831 954f8c5b-7b00-dc11-b283-0030488c597c
campbellbarton
patch [#34886] BMesh Individual Face Inset from Francisco De La Cruz (xercesblue) with some simplifications to the patch. git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55830 954f8c5b-7b00-dc11-b283-0030488c597c
campbellbarton
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. git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55829 954f8c5b-7b00-dc11-b283-0030488c597c
campbellbarton
add BM_face_calc_center_mean_weighted() gives much better result at cost of some speed. git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55827 954f8c5b-7b00-dc11-b283-0030488c597c
blendix
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. git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55826 954f8c5b-7b00-dc11-b283-0030488c597c
campbellbarton
code cleanup: include order git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk@55825 954f8c5b-7b00-dc11-b283-0030488c597c
nazgul
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 …
  1. Prev
  2. Next