Commit Graph

256 Commits

Author SHA1 Message Date
Tamito Kajiyama
ac9ec06ec1 Merged changes in the trunk up to revision 54421.
Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/properties_render.py
source/blender/SConscript
source/blender/blenloader/intern/readfile.c
2013-02-10 10:17:59 +00:00
Ton Roosendaal
1dfb6404b7 Release todo: added userpref for Mac users having "Natural Scroll" set.
As per discussion and analysis of all trackpad usage, we now
follow this convention:

- Blender follows system setting for trackpad direction preference.

- If you set your system to "natural" scroll, we need to invert a couple
  of cases in Blender we do "natural" already. Like:

   - view rotate (the inversed option just never feels ok)
   - scroll active items in list or pulldown menu (up/down is absolute)
   - ALT+scroll values in buttons (up/down is absolute)

The new User Preference setting "Trackpad Natural" handles this.

For 2.66 we only have trackpad handling for OS X... so this isn't
affecting trackpad usage in Windows and Linux, which stick to be mapped
to Scroll Wheel still.

(Note: viewrotate now is "natural" always, changing how it worked in the
past weeks).
2013-02-08 12:12:57 +00:00
Ton Roosendaal
134c656878 New matcap collection for default in release. It's now 24 images, ordered
from regular diffuse to more shiny, stone, wax, eflective, glass and two non-realistic ones.

The menu now shows it in 3 rows. I made the previews a bit smaller, 96 pixels,
like the brushes for painting. 

Thanks everyone for submitting pics! I updated the credit file too, but name
from one person is missing still, will be added next.
2013-02-05 16:16:07 +00:00
Sergey Sharybin
b2f6c49830 Cycles preview scene: made render layer name match name used for BI preview
This is needed because render result is being reused between different render
previews and keeping names out of sync means once preview result was created
for blender internal, it wouldn't be updated after switching to cycles.

Same goes to switching from cycles to other renderers like lux and yaf.

Simply updated cycles_preview.blend for now, could be solved from code side
as well, but IMO better to collect such a limitations of preview blend files
and solve them all together during "custom preview.blend for external engines"
project.

Reported by Jens in IRC.
2013-02-04 11:06:47 +00:00
Campbell Barton
343fb03677 startup.blend edits
- make timeline less tall.
- make outliner more tall.
- set node and image channel displayes to RGBA.
2013-01-30 15:34:02 +00:00
Tamito Kajiyama
fe26492538 Merged changes in the trunk up to revision 54171. 2013-01-29 03:42:19 +00:00
Pablo Vazquez
9e7e27b23c Cycles Preview: Rotated Suzanne a bit for better angle. Raised the intensity of the mesh light, and moved the mesh/lamp to also be in the layer of World Sphere preview (was black previously, since it had no lamps) 2013-01-28 22:08:30 +00:00
Thomas Dinges
73db09e195 Cycles Preview Blend:
* Added UV Mapping for objects, so Image textures will work.
2013-01-28 19:15:47 +00:00
Brecht Van Lommel
5ac4b38a20 Cycles: preview rendering support for world/material/lamp.
Patch by Sergey, .blend by Thomas and some further tweaks by me.

Still to solve later: allow external engines to specify own preview .blend, for
now the code here is doing too much magic hacking on the preview scene still.
2013-01-28 17:37:51 +00:00
Tamito Kajiyama
556912792a Merged changes in the trunk up to revision 54110.
Conflicts resolved:
source/blender/blenfont/SConscript
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_scene.c
2013-01-26 23:49:13 +00:00
Ton Roosendaal
1a6048426b Confirming GPL license and thanks to the people who provided the matcaps:
Knt Trammell and Aidy Burrows and John Herreno.
2013-01-22 11:29:29 +00:00
Ton Roosendaal
e11d22a6b7 Matcap support in 3D Viewport.
Full log is here:
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability#Matcap_in_3D_viewport

Implementation notes:

- Matcaps are an extension of Solid draw mode, and don't show in other drawmodes.
  (It's mostly intended to aid modeling/sculpt)

- By design, Matcaps are a UI feature, and only stored locally for the UI itself, and
  won't affect rendering or materials.

- Currently a set of 16 (GPL licensed) Matcaps have been compiled into Blender. 
  It doesn't take memory or cpu time, until you use it.

- Brush Icons and Matcaps use same code now, and only get generated/allocated on
  actually using it (instead of on startup).

- The current set might get new or different images still, based on user feedback.

- Matcap images are 512x512 pixels, so each image takes 1 Mb memory. Unused matcaps get 
  freed immediately. The Matcap icon previews (128x128 pixels) stay in memory.

- Loading own matcap image files will be added later. That needs design and code work 
  to get it stable and memory-friendly.

- The GLSL code uses the ID PreviewImage for matcaps. I tested it using the existing
  Material previews, which has its limits... especially for textured previews the
  normal-mapped matcap won't look good.
2013-01-22 11:18:41 +00:00
Joshua Leung
2e18f7ff93 Updating icons to 2.5.08 (see [#33448])
Thanks Wolter van der Velde for adding the (most of) the missing Force Field
icons
2013-01-21 11:25:04 +00:00
Tamito Kajiyama
94ae0232b0 Merged changes in the trunk up to revision 53729.
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenloader/intern/readfile.c
2013-01-12 02:02:53 +00:00
Campbell Barton
c87fed669b correct 2 issues with startup.blend
- scroll bars were not in info space
- bake bias was 0.0, changed to 0.001 as it is for new scenes
2013-01-06 15:59:14 +00:00
Tamito Kajiyama
feccbaabbd Merged changes in the trunk up to revision 53584.
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_enum_types.h

Also made additional code updates for:
r53355 UIList - Python-extendable list of UI items
r53460 Alpha premul pipeline cleanup
2013-01-05 22:24:05 +00:00
Nicholas Bishop
fc442dbd51 Add DNA/RNA/BKE infrastructure for dynamic-topology sculpt mode
* Add a detail_size field to the Sculpt struct, two new sculpt flags,
  and a Mesh flag for dynamic-topology mode; that's it for file-level
  changes needed by dynamic topology

* Add RNA for the new DNA field and flags

* Add a new icon for dynamic-topology created by Julio Iglesias. TODO:
  update the icon for the new SVG icon format

* Add a SculptSession function for converting from BMesh to Mesh,
  handles reordering mesh elements and setting face shading
2012-12-30 18:27:33 +00:00
Tamito Kajiyama
40449b1994 Merged changes in the trunk up to revision 53280. 2012-12-23 00:23:11 +00:00
Ton Roosendaal
80bcc20835 Updated icon svg and bitmaps. Now has the movieclip editor again :) 2012-12-20 12:56:46 +00:00
Bastien Montagne
be67de7cab More tweaks to WeighVG icon 2012-12-19 16:48:06 +00:00
Campbell Barton
17c5c9935c icon update [#33448] Adding Vector Sources for Icons
from:	Blender ICONS - v.2.5.08 (GPL).svg

also updated the shell script.
2012-12-19 14:57:01 +00:00
Tamito Kajiyama
d433cd65f7 Merged changes in the trunk up to revision 53146.
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
2012-12-19 01:49:58 +00:00
Ton Roosendaal
8168fba972 Icons now draw good again!
- Exported via Inkscape a 16 and 32 pixel bitmap version
- Use these as mipmap levels for OpenGL texture drawing.
- Changed code to get right sizes for drawing icons - better than last week's method.

Todo:

- Custom icons don't work yet (old one)
- Missing icons in the svg
- The .sh script for inkscape needs changed to support this
  (now do manual saving)
2012-12-18 19:35:54 +00:00
Ton Roosendaal
3c2b5e7fc0 Blender icons now are in the 21st century too!
Default size for bitmap now is 32x32 pixels. Code change for higher densities is easy,
all under review. Let's first check this!
2012-12-18 15:10:54 +00:00
Bastien Montagne
9064f0cb51 Adding Amharic (i.e. ethiopic) glyphs. 2012-12-18 09:03:21 +00:00
Bastien Montagne
c1976dfd28 Added WeightVG modifier icon to svg file (and tried enhance it slightly). 2012-12-18 08:50:22 +00:00
Campbell Barton
dd582e0308 set compositor background scale to 1.0 2012-12-16 09:41:39 +00:00
Campbell Barton
16003d2738 commands to convert svg-to-png as shell scripts (just for convenience), and center prvicons.svg so the resulting image is sized properly. 2012-12-14 15:17:53 +00:00
Joshua Leung
455693a6ea SVG Icons: Frame Next/Prev (used for Motion Tracker controls) 2012-12-14 01:52:08 +00:00
Joshua Leung
31ee55ef23 SVG Icons: Back to screen icon 2012-12-14 01:40:09 +00:00
Joshua Leung
370c0ce09f SVG Icons - Ported over some of the animation related icons
* Made SVG versions of the NLA solo (star) icons. These are much nicer than the hack 'n slash bitmap versions, but could still do with some polish. The svg is too heavy to do fine tweaks here.

* Ported over the mute/graph-visible icons
* Recreated Drivers icon

* Moved Blender icon from AD1/DA1 to AD16/DA16, as per the trunk icon sheet
2012-12-14 01:34:11 +00:00
Campbell Barton
60800669d5 patch [#33448] Adding Vector Sources for Icons
add additional icons to the svg.
2012-12-13 23:18:38 +00:00
Campbell Barton
b120e649f2 remove unrelated text 2012-12-13 12:52:12 +00:00
Campbell Barton
97bea740f8 svg source files from jendrzych, v. 2.5.06
split SVG in two to match the PNG's.

Original URL: http://pixel-sized.blogspot.nl/2012/05/two-years-of-absence-here.html#more
2012-12-13 11:54:39 +00:00
Brecht Van Lommel
cb2ad513bb Splash template XCF file for Gimp. 2012-12-11 08:01:05 +00:00
Tamito Kajiyama
c9dc80111b Merged changes in the trunk up to revision 52858.
Congratulations to all trunk devs on the Blender 2.65 release!
2012-12-10 23:34:41 +00:00
Brecht Van Lommel
cc551ed218 Splash screen for 2.65, created by Jordan Schur. 2012-12-10 14:01:08 +00:00
Tamito Kajiyama
5083e0737f All angle properties were switched from degrees to radians (using PROP_ANGLE
RNA subtype), since Freestyle internally use angles in radians.
A patch set by Bastien Montagne (many thanks!)

NOTICE FOR BRANCH USERS:
This commit may break line drawing settings of already saved Freestyle files.
All angles are now treated as radians instead of degrees, so collections of
angle values might be necessary in order to recover previous visual results.
Affected properties are:
- Crease Angle in the edge detection options
- Min 2D Angle in the 'Splitting' section of a line style
- Max 2D Angle in the 'Splitting' section of a line style
- 'orientation' parameter of the Calligraphy thickness modifier
- 'angle' parameter of the PerlinNoise1D geometry modifier
- 'angle' parameter of the PerlinNoise2D geometry modifier
- 'angle' parameter of the 2DTransform geometry modifier
2012-12-09 23:19:46 +00:00
Tamito Kajiyama
ec33687d6c Merged changes in the trunk up to revision 52815. 2012-12-08 12:35:14 +00:00
Campbell Barton
4f3fdb8d5a R/G/B icons in node space backgroud channel selector all had same color wheel icon which didnt make much sense. 2012-12-03 13:01:07 +00:00
Tamito Kajiyama
ed0e2fbd9f Merged changes in the trunk up to revision 52690.
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenlib/intern/bpath.c
2012-12-01 02:47:59 +00:00
Campbell Barton
25b7d35484 fix/workaround [#33309] small + in few windows
text/image/compo were missing '+', toggling adds them.
2012-11-28 09:10:27 +00:00
Tamito Kajiyama
53840c7db5 Merged changes in the trunk up to revision 52546.
Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/idcode.c
2012-11-26 02:32:34 +00:00
Campbell Barton
24c94eb61c changes to startup.blend
- Set render tile size to 64x64 pixels
- Set default lamp area size to 0.1 (see commit 52012)
2012-11-21 08:59:25 +00:00
Antony Riakiotakis
347b257131 Custom icon for triangulate modifier. 2012-11-19 23:35:38 +00:00
Tamito Kajiyama
a8a2782d34 Merged changes in the trunk up to revision 51985. 2012-11-07 22:12:19 +00:00
Andrea Weikert
ecda79a8b8 == file browser ==
[#33080] Backup icons - further integration
Contributed by Georg Kronthaler, many thanks!

* enables display of correct file icon on splash screen and in Open Recent menu
* exposes filter_backup in the python api
* enables setting BLENDERFILE_BACKUP as active filter in file browser from wm_operators.c (and from .blend in case this setting will be saved in the future)
* adds a comment to slightly misleading function name file_is_blend_backup()
* Updates icon for backup files to be more consistent with icon for .blend files
2012-11-06 20:29:14 +00:00
Tamito Kajiyama
15ed834343 Merged changes in the trunk up to revision 51718.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_scene.c
release/datafiles/startup.blend
2012-10-29 01:09:12 +00:00
Tamito Kajiyama
5acd5d1497 Improvements of Freestyle GUI controls - Part 1.
This commit makes a set of fixes and improvements based on the results of
Freestyle branch review by Brecht.  The discussion thread is:
http://lists.blender.org/pipermail/bf-committers/2012-October/037927.html

* The Layers panel and Freestyle-related panels in the Render tab of the
Properties window were moved to the newly created Render Layers tab.
The idea is to separate per render layer rendering options into a distinct
Properties window tab, and use the existing Render tab to accommodate
per scene rendering options.

* The new Freestyle panel was added in the Render tab.  The panel header
contains a toggle button for globally enabling Freestyle, with the aim of making
Freestyle easier to find.  Those Freestyle options in the Post Processing panel
were also moved to the new panel. 

* GUI code was updated so that UI controls will be greyed out (instead of
being hidden) when Freestyle is disabled.  Additional UI changes were also
made to reduce space consumption.

* The list of line sets was moved from the Freestyle panel to the Freestyle:
Line Sets panel.

* Old ray-casting algorithms were removed from the UI.  Now only two
algorithms (culled and non-culled cumulative visibility detection algorithms)
are available, and the selection is done by the new "Culling" toggle button
within the edge detection options.
2012-10-28 16:09:51 +00:00
Andrea Weikert
8a6797d6a9 == file browser ==
PATCH: [#32989] Activate backup files filter in File Browser
Contributed by Georg Kronthaler, many thanks!
(I just moved the icon to a different place reserved for file browser icons)

* enables the filtering of backup files in the file browser
* adds a 'filter backup files'-icon to the filter buttons
* adds new icons for backup files in list and thumbnail view
* enables file preview for the backup files
2012-10-27 18:31:52 +00:00