griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
37,770 Commits 1 Branch 0 Tags
3b711a6ed009b35bb69cd0ca878eeb8d55fa0e77
Commit Graph

2386 Commits

Author SHA1 Message Date
Tamito Kajiyama
3b711a6ed0 Merged changes in the trunk up to revision 45133. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mesh_conv.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/shadeoutput.c
 2012-03-25 08:20:19 +00:00
Campbell Barton
b8a71efeba style cleanup: follow style guide for/with/if spacing 2012-03-24 07:52:14 +00:00
Campbell Barton
ab4a2aaf4a style cleanup: follow style guide for formatting of if/for/while loops, and else if's 2012-03-24 06:38:07 +00:00
Campbell Barton
2f348d8b5d style cleanup: mainly for mesh code, also some WM function use. 2012-03-24 02:51:46 +00:00
Campbell Barton
b6c2f9ddab style cleanup: enforce macros using a semicolon. 2012-03-22 01:35:13 +00:00
Sergey Sharybin
d78accb585 Correction for previous commit to make normals direction always inside 2012-03-20 17:00:25 +00:00
Sergey Sharybin
5ae9ad9113 Fix #30420: Metaball Shading Inverted in Raytrace Reflection (Blender Internal) 
Issue was caused by negative scale of camera. Metabolls are using procedural
normals and in case of negative scaled camera normals for them shall be flipped.
 2012-03-20 16:17:34 +00:00
Campbell Barton
9dd0c4c232 rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines. 2012-03-20 08:42:26 +00:00
Alexander Kuznetsov
f11a6d3a84 Adds support for utf paths on Windows. 
Not all file formats/calls are supported yet. It will be expended.

Please from now on use BLI_fopen, BLI_* for file manipulations.
For non-windows systems BLI_fopen just calls fopen.
For Windows, the utf-8 string is translated to utf-16 string in order to call UTF version of the function.
 2012-03-20 02:17:37 +00:00
Campbell Barton
4f19c1a995 spelling cleanup 2012-03-18 07:38:51 +00:00
Campbell Barton
3633858fdb code cleanup: 
* replace 2D vector copy with copy_v2_v2().
* use puts rather then printf for single strings.
* style cleanup for drawobject.c indentation.
 2012-03-18 06:01:33 +00:00
Brecht Van Lommel
b53cbb4e01 Fix #30512: external render saved render result after reporting error. 2012-03-12 11:32:23 +00:00
Campbell Barton
c21c58f44c style cleanup, also remove unused externs. 2012-03-11 19:09:01 +00:00
Campbell Barton
178c2c32f2 [#30503] Callback for render job completion 
from Jason van Gumster (thefallenweeble)

adds render_complete and render_cancel callbacks to bpy.app.handlers
 2012-03-11 17:24:03 +00:00
Tamito Kajiyama
a2ebfc82db Merged changes in the trunk up to revision 44797. 
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_mesh.c
 2012-03-10 21:56:23 +00:00
Campbell Barton
89a963fb7f style cleanup: comment blocks 2012-03-09 18:28:30 +00:00
Campbell Barton
dfdfa3d51b code cleanup: replace macros VECCOPY, VECADD, VECSUB, INPR - with BLI_math funcs. 
added copy float/double funcs: copy_v3fl_v3db(), copy_v3db_v3fl(). 2d & 4d too.
 2012-03-09 06:04:17 +00:00
Campbell Barton
4f7bdc59d3 style cleanup: spelling. 
also remove large, duplicate comments from sunsky.h
 2012-03-09 00:41:09 +00:00
Campbell Barton
46045fbb09 style cleanup - braces & else / if's 2012-03-07 04:53:43 +00:00
Campbell Barton
400a0297b0 - simplify rip code not to expand/contract selection. 
- disable BVH edge visibility test (ifdef'd out. dont think its really needed)
 2012-03-07 00:08:00 +00:00
Campbell Barton
31d2ee9bf7 style cleanup, brackets in else/if, some indentation. 2012-03-06 18:40:15 +00:00
Campbell Barton
f6ae27daef style cleanup - comment spelling + translate some dutch. 2012-03-04 04:35:12 +00:00
Bastien Montagne
685fda4f13 Many i18n fixings, based on [#30428] [2.62] Translation Issues. 
In fact, most "UI special cases" are not well translated, currently. :/ This affects especially the "Properties" panels. This commit should address problems in Graph editors, and 3D View (but probably not yet all of them). Yet it already adds more than 100 new messages (and fixes translated drawing of more).

Also done some style edits…
 2012-03-03 21:42:21 +00:00
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