3197796cf7
Merged changes in the trunk up to revision 42425.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c
2011-12-05 02:12:49 +00:00
9e5b28cd42
svn merge ^/trunk/blender -r42261:42290
2011-11-30 09:31:11 +00:00
d949dd6849
Fix #27981 : opengl render + render slots not working.
...
This also revealed an issue where the opengl render float buffer was not linear,
and toggling back to a render slot would show wrong colors. Now it converts the
float buffer to linear so that this goes ok, disadvantage is that it's slower.
2011-11-29 22:37:16 +00:00
063dd4f60a
svn merge ^/trunk/blender -r42197:42221
2011-11-28 17:09:13 +00:00
7baaa08211
Fix #29389 : cycles viewport render not updating on frame changes. This sort of
...
worked by accident before, because of flags that weren't cleared properly. Now
moved the call to update render engines into scene_update_* itself.
2011-11-28 14:55:35 +00:00
3b5bcab09c
svn merge ^/trunk/blender -r42139:42172
2011-11-26 16:29:14 +00:00
b6569ee4e7
Merged changes in the trunk up to revision 42116.
2011-11-26 13:11:55 +00:00
6736576f6d
replace FILE_MAXDIR + FILE_MAXFILE with FILE_MAX
2011-11-26 04:07:38 +00:00
0d9d7d3c9d
Fix for functionality inconsistency in the creation of a new line style.
...
Now the '+' button to the right of a line style name (in the template_ID
GUI widget) creates a copy of the active line style instead of a new
line style with default settings.
Also added a proper tool tip for the use of template_ID for line styles.
2011-11-25 01:09:57 +00:00
74c6c91ba6
svn merge ^/trunk/blender -r42080:42095
2011-11-23 17:14:27 +00:00
307a0f6fec
Fix #28934 : missing GLSL/icon update when changing materials used in nodes.
2011-11-23 15:16:41 +00:00
f9e00b5c99
svn merge ^/trunk/blender -r42009:42053
2011-11-22 11:51:42 +00:00
da25b50ccb
image save operator now shares settings and UI with render & image out node.
...
details:
- setting format options from python isnt possible anymore since this isnt exposed via op->properties, python should use image.save() function instead.
- image save UI now hides 'Relative' option when copy is selected since it has no effect.
- default image depth is set to 8 or more if the image has no float buffer, otherwise its set to 32 or less.
other fixes:
- image new was adding an image with a filepath set to "untitled", if this file happened to exist in the current directory a save on the generated image would overwrite it, now initialize to empty path.
- BKE_ftype_to_imtype was returning an invalid value if ftype==0.
2011-11-21 23:56:32 +00:00
30fd1ab523
replace ImBuf.depth with ImBuf.planes to match ImageFormatData.planes & to avoid confusion with ImageFormatData.depth
2011-11-21 20:47:19 +00:00
0e2c8cdcdd
move image settings into their own structure so the interface can be shared where image saving settings are needed.
...
currently file out node and render output share this struct & UI.
2011-11-21 20:19:58 +00:00
1b8c14b453
Replaced the changes in revision 41810 with a better implementation
...
of copy/paste functionality. Instead of making a copy of the active
line set, now the settings of the active line set are copied to and
pasted from a buffer. This allows for copying and pasting line set
settings among different scenes and render layers.
2011-11-20 23:44:50 +00:00
2676f2d58f
Merged changes in the trunk up to revision 42021.
...
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/pipeline.c
2011-11-20 21:02:12 +00:00
8eb41f0fdb
svn merge ^/trunk/blender -r41998:42009
2011-11-20 16:05:51 +00:00
f1eb66aa68
share code for fluidsim, ocean & dynamic paint file paths.
...
- use BLI_join_dirfile for joining all paths (no need to ensure slash is appended).
- paths from linked library files now supported.
2011-11-20 14:38:11 +00:00
3c8d86e117
svn merge ^/trunk/blender -r41961:41998
2011-11-20 01:14:33 +00:00
5429a701c4
Camera: more code refactoring, adding a function to create CameraParams from
...
3d view, deduplicating the complex code for setting up the viewplane.
2011-11-18 21:19:03 +00:00
e1250f2168
svn merge ^/trunk/blender -r41954:41961
2011-11-18 09:34:45 +00:00
9f0a6dca13
Added methods new and remove to scene.render.layers, so now render layers
...
can be created and removed from scripts.
2011-11-18 07:11:54 +00:00
9d05ccf9e8
svn merge -r41899:41926 ^/trunk/blender. also sync mempool with trunk and move BLI_mempool_alloc out of mempools header where it was inlined
2011-11-16 19:06:38 +00:00
c4e029a274
Fix #29287 : cycles and other external render engines did not print correct frame
...
number in background render.
2011-11-16 12:47:37 +00:00
caeeb37601
Added a new operator in the Parameter Editor mode to make a copy
...
of the active line set.
2011-11-13 21:55:13 +00:00
80e398e7b2
Merged changes in the trunk up to revision 41638.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
2011-11-08 06:30:02 +00:00
e936c78251
svn merge ^/trunk/blender -r41503:41575
2011-11-06 10:38:44 +00:00
647447db58
Code refactoring: split lamp functions from object.c into new lamp.c.
2011-11-05 13:11:49 +00:00
2d787e6e01
utility function to find the biggest area: BKE_screen_find_big_area(...), was being done with static functions that were copied about.
2011-11-04 01:15:04 +00:00
70b7402252
svn merge -r41480:41503 ^/trunk/blender
2011-11-03 22:58:05 +00:00
224c26f891
Fix #28998 : sequence rendering with wrong progress bar
...
Show overall progress when doing sequence rendering. Nice for cases when
you're using sequencer to combine video strips only, without rendering
scenes and so. If scene strips are used in sequencer, per-frame rendering
would be used (because of scene rendering sets per-frame progress).
2011-11-03 17:06:12 +00:00
5fbf3b813c
svn merge -r41458:41480 ^/trunk/blender
2011-11-02 23:16:10 +00:00
ac52c79cb1
RenderEngine/Nodes: system to check for shading nodes compatibility
...
* Scene.use_shading_nodes property to check if RenderEngine is using new shading
nodes system, and RenderEngine.bl_use_shading_nodes to set this.
* Add mechanism for tagging nodes as being compatible with the old/new system.
2011-11-02 19:24:30 +00:00
30f1f28a8a
Nodes: add support for shader nodes on world and lamps, in addition to materials.
...
The internal render engine does not support them, and they are not accesible in
the UI yet, but cycles will use them.
2011-11-02 18:55:32 +00:00
97a0ae3e1b
RenderEngine api: support for viewport rendering, details here:
...
http://wiki.blender.org/index.php/Dev:2.6/Source/Render/RenderEngineAPI
* This adds a Rendered draw type in the 3D view, only available when
the render engine implements the view_draw callback.
* 3D view now stores a pointer to a RenderEngine.
* view_draw() callback will do OpenGL drawing instead of the viewport.
* view_update() callback is called after depsgraph updates.
2011-11-02 18:20:53 +00:00
9be43762bc
svn merge -r41431:41453 ^/trunk/blender
2011-11-01 23:24:51 +00:00
d55298ee3c
Fix #29109 : bpy.ops.render.render() with scene parameter missed compositing,
...
previous bugfix needed a bit more refining.
2011-11-01 14:51:44 +00:00
1f25228857
Fix for warnings about period at the end of description strings for
...
RNA operators and properties. No functional changes were made.
2011-10-30 09:05:47 +00:00
65668dc5eb
Merged changes in the trunk up to revision 41368.
...
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c
2011-10-30 02:03:40 +00:00
bd86ba2c88
svn merge -r41335:41371
2011-10-30 01:27:49 +00:00
16702c1729
Merged changes in the trunk up to revision 41225.
...
Conflicts resolved:
source/blender/render/intern/source/pipeline.c
2011-10-29 15:46:14 +00:00
ed77c356fc
Fix: OpenGL renders on graphics cards which do not support non-power-of-two
...
textures were stretched and the wrong size.
2011-10-28 16:57:06 +00:00
75e570b2b7
svn merge -r41287:41310 ^/trunk/blender note, mirror modifier had slow, per vertex name flipping, replaced with flip_map from trunk
2011-10-27 09:42:03 +00:00
15e6d6cd75
svn merge ^/trunk/blender -r41226:41227 .
2011-10-24 12:43:08 +00:00
70bf00a74c
svn merge ^/trunk/blender -r41200:41226 .
2011-10-24 08:45:55 +00:00
ad1d3dd30f
svn merge ^/trunk/blender -r41175:41200 --- will need to apply fix after
2011-10-24 07:56:42 +00:00
0503a4f7a6
svn merge ^/trunk/blender -r41100:41150
2011-10-24 04:18:28 +00:00
4a04f72069
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
0664868aec
BLI_make_file_string wasn't guaranteed to initialize the resulting path, some parts of the code accounted for this but most not, always initialize the string to "".
2011-10-23 05:56:55 +00:00
