griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
37,284 Commits 1 Branch 0 Tags
e9eed190e83eb351aeb435d21287eaf37fcffeb0
Commit Graph

2363 Commits

Author SHA1 Message Date
Tamito Kajiyama
9e93fc1e8a Merged changes in the trunk up to revision 44612. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh.h
 2012-03-03 01:43:44 +00:00
Campbell Barton
7bbf4b7831 style cleanup 
- spelling - turns out we had tessellation spelt wrong all over.
- use \directive for doxy (not @directive)
- remove BLI_sparsemap.h - was from bmesh merge IIRC but entire file commented and not used.
 2012-03-02 16:05:54 +00:00
Brecht Van Lommel
2942eab57c Fix #30413: dynamic paint crash with texture slots with no texture assigned. 2012-03-01 20:41:13 +00:00
Brecht Van Lommel
8643b8a02d Fix related to #30416: python render_stats handler now also gets called when the 
saved file message is printed.
 2012-03-01 19:19:10 +00:00
Brecht Van Lommel
dff2e84427 Fix #30415: motion blur option still had an effect on external engines / cycles, 
should not be used then.
 2012-03-01 19:19:04 +00:00
Brecht Van Lommel
93249c35b1 Fix related to #30384: multilayer exr files not saving compressed correctly. 2012-03-01 16:41:51 +00:00
Campbell Barton
ea13ec1699 Spelling Cleanup 2012-03-01 12:20:18 +00:00
Tamito Kajiyama
35708fe150 Merged changes in the trunk up to revision 44561. 
Conflicts resolved:
source/blender/bmesh/bmesh.h
source/blender/bmesh/bmesh_operators.h
source/blenderplayer/bad_level_call_stubs/stubs.c
 2012-02-29 21:35:49 +00:00
Campbell Barton
7cc206ddca Code Cleanup: remove non existing function declarations. 
added some missing functions too - which are not used yep but should be there for api completeness.
* CDDM_set_mloop
* CDDM_set_mpoly
* BLI_mempool_count
 2012-02-29 15:00:37 +00:00
Campbell Barton
47c373c7a9 style cleanup (mostly whitespace) 2012-02-27 10:35:39 +00:00
Tamito Kajiyama
69289c978e Merged changes in the trunk up to revision 44266 (including BMesh). 
Freestyle edge/face marks were ported to BMesh.

Conflicts resolved:
source/blender/editors/mesh/editface.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_meshdata_types.h
source/blender/blenkernel/intern/editderivedmesh.c
 2012-02-21 01:40:04 +00:00
Campbell Barton
5148828356 svn merge ^/trunk/blender -r44235:44250 2012-02-19 17:59:30 +00:00
Campbell Barton
02b28e9162 replace MIN2 / MAX2 with minf / maxf to avoid calling functions multiple times. 2012-02-19 05:11:24 +00:00
Tamito Kajiyama
910f04ca63 Merged changes in the trunk up to revision 44221. 
Conflicts resolved:
release/datafiles/blender_icons.png
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenloader/intern/readfile.c
 2012-02-18 11:26:11 +00:00
Campbell Barton
48006292d8 svn merge ^/trunk/blender -r44189:44204 2012-02-17 20:56:25 +00:00
Campbell Barton
61596d5bb3 patch [#30227] Various MSVC (32-bit) Warning and Typo Fixes 
made some small edits
- removed changes to AVI reading since the data types are apart of the format spec.
- absf -> abs for a double value in render code.
 2012-02-17 19:21:47 +00:00
Campbell Barton
2b7ca2304a unify include guard defines, __$FILENAME__ 
without the underscores these clogged up the namespace for autocompleation which was annoying.
 2012-02-17 18:59:41 +00:00
Tamito Kajiyama
5c5685f6c5 Merged changes in the trunk up to revision 44039. 2012-02-12 00:09:48 +00:00
Campbell Barton
19d0f93099 svn merge ^/trunk/blender -r43934:43976 2012-02-08 05:45:16 +00:00
Brecht Van Lommel
9467ddb903 Fix #30081: the fix for #30026 related to rendering indirect/environment light 
with material ambient zero broke backwards compatibility too much. The behavior
to have ambient zero affect things even if it is not used as a factor does not
make much sense but keeps things compatible. Now instead fixed the use of
uninitialized memory.
 2012-02-07 21:04:10 +00:00
Campbell Barton
d0412a1981 svn merge ^/trunk/blender -r43864:43887 2012-02-05 02:30:30 +00:00
Tamito Kajiyama
8160829303 Merged changes in the trunk up to revision 43881. 2012-02-04 14:22:05 +00:00
Campbell Barton
deec4ce0bc Code Cleanup: avoid double promotion. 2012-02-04 06:55:29 +00:00
Campbell Barton
075fee4d58 svn merge ^/trunk/blender -r43830:43864 2012-02-03 01:30:21 +00:00
Brecht Van Lommel
5c9ad8653a Fix #29921: render rasterization error in a corner case, only happened on 32bit 
builds because of extended float precision, slightly tweaked code to avoid that,
so that it works the same as on 64bit.
 2012-02-02 21:46:11 +00:00
Brecht Van Lommel
01d0e279db Fix related to #30053: crash rendering scene strips without a scene (due to missing library). 2012-02-02 13:21:38 +00:00
Campbell Barton
4aa82806ef svn merge ^/trunk/blender -r43751:43819, need to look into changes made to editmesh_loop.c from this range still 2012-02-01 09:31:13 +00:00
Brecht Van Lommel
40beecea8f Fix #30026: errors rendering material with ambient 0 and AO/env/indirect light. 
It would skip rendering the latter if ambient was 0, however this is not actually
used in adding the contribution from these.
 2012-01-30 19:47:30 +00:00
Tamito Kajiyama
831f339980 Merged changes in the trunk up to revision 43748. 
Conflicts resolved:
source/blender/editors/include/UI_resources.h
 2012-01-29 12:00:04 +00:00
Campbell Barton
de4eeb9694 svn merge ^/trunk/blender -r43693:43733 2012-01-26 19:20:33 +00:00
Brecht Van Lommel
2e9ae40aaf Fix #29960: fields option should not be used for external engine rendering. 2012-01-26 14:55:46 +00:00
Campbell Barton
4fae6cd38d svn merge ^/trunk/blender -r43685:43693 2012-01-25 18:13:58 +00:00
Brecht Van Lommel
f99343d3b8 Cycles: Render Passes 
Currently supported passes:
* Combined, Z, Normal, Object Index, Material Index, Emission, Environment,
  Diffuse/Glossy/Transmission x Direct/Indirect/Color

Not supported yet:
* UV, Vector, Mist

Only enabled for CPU devices at the moment, will do GPU tweaks tommorrow,
also for environment importance sampling.

Documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Passes
 2012-01-25 17:23:52 +00:00
Campbell Barton
4966982a5a svn merge ^/trunk/blender -r43564:43609 2012-01-22 18:04:35 +00:00
Campbell Barton
cd4123e1db use inline BLI_math functions for dot product and length calculation. 2012-01-22 17:20:37 +00:00
Tamito Kajiyama
68ae82bb47 Merged changes in the trunk up to revision 43585. 
Conflicts resolved:
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c
 2012-01-21 23:01:25 +00:00
Campbell Barton
c8037fb56a svn merge ^/trunk/blender -r43530:43554 2012-01-20 12:34:00 +00:00
Sergey Sharybin
f0fc8c22bb Fix #27120: Bake to image used for rendering glitch (bake feedback loop) 
Detect feedback loop and do not bake to images detected in this loop and show
nice warning message in such cases.

It's a way which wouldn't overcomplicate code trying to duplicate images and so
without real benefit.
 2012-01-20 07:43:46 +00:00
Campbell Barton
7b2101ace9 svn merge ^/trunk/blender -r43482:43524 2012-01-19 11:31:31 +00:00
Campbell Barton
a87c5eb52c use color conversions functions in more places. 
also add rgba_float_to_uchar, rgba_uchar_to_float
 2012-01-19 10:04:51 +00:00
Campbell Barton
4786541285 add utility functions linearrgb_to_srgb_uchar4, 
linearrgb_to_srgb_uchar3, was being done inline.
 2012-01-19 08:22:23 +00:00
Brecht Van Lommel
7162ca5be7 Fix #29922: NaN pixels due to bump map in degenerate case. 2012-01-18 22:36:19 +00:00
Tamito Kajiyama
2453b16717 Fix for a crash with FSAA enabled and Freestyle disabled. 
Problem report by Victor / tokiop, many thanks!
 2012-01-18 21:38:33 +00:00
Tamito Kajiyama
e0df491d1e Merged changes in the trunk up to revision 43404. 
Conflicts resolved:
source/blender/python/SConscript
 2012-01-15 23:13:12 +00:00
Campbell Barton
917714acf7 svn merge ^/trunk/blender -r43345:43381 2012-01-15 09:16:39 +00:00
Campbell Barton
0d5595befb add utility function to BLI_math_color - rgb_to_luma, rgb_to_luma_byte, also use rgb_to_grayscale in more places. 2012-01-14 17:14:23 +00:00
Campbell Barton
0863575816 tag unused function args in raytrace code. 2012-01-14 10:08:47 +00:00
Sergey Sharybin
74aede4d71 Fix #29824: Error writing frame if 3D scene starts after first frame of animation and output is H264 
Issue was caused by incorrectly set PTS value frames came form Scene strip renderer.
This value used to be calculated from RenderData current and start frame which
lead to non-uniformuly counting which totally confuses encoder.

Switch append_avi and append_ffmpeg to use current frame from rendering scene
(which was already passing to this functions and was used mostly for logging)
and start frame of rendering scene (it's new parameter added). This allowed to
calculate correct PTS value easily and get rid of global static sframe variable
in writeavi.c file.
 2012-01-13 09:20:13 +00:00
Campbell Barton
705f23064e svn merge ^/trunk/blender -r43294:43338 2012-01-13 01:39:57 +00:00
Campbell Barton
c4473dc51c added comment; zbuffillGLinv4 and zbuffillGL4 are identical except for a 2 lines. 
no functional changes.
 2012-01-12 07:10:44 +00:00