9d49fa0e63
style cleanup - spelling corrections & update some incorrect comments.
2012-03-03 11:45:08 +00:00
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
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
ea13ec1699
Spelling Cleanup
2012-03-01 12:20:18 +00:00
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
49adbe3ab8
Various fixes to UI messages (among other things, all messages needed it should now be capitalized).
2012-02-27 18:14:56 +00:00
47c373c7a9
style cleanup (mostly whitespace)
2012-02-27 10:35:39 +00:00
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
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
48006292d8
svn merge ^/trunk/blender -r44189:44204
2012-02-17 20:56:25 +00:00
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
7c15fb4f2c
Minor fixes found while working on keyingsets.
2012-02-17 16:34:28 +00:00
5c5685f6c5
Merged changes in the trunk up to revision 44039.
2012-02-12 00:09:48 +00:00
b0f9d3a8af
svn merge ^/trunk/blender -r43918:43934
2012-02-06 22:21:41 +00:00
297a21c39a
Code Cleanup:
...
don't call CTX_data_scene(C) for every marker drawn
also remove unneeded call when scene was already defined as well as redundant scene cast.
2012-02-06 22:17:41 +00:00
d0412a1981
svn merge ^/trunk/blender -r43864:43887
2012-02-05 02:30:30 +00:00
8160829303
Merged changes in the trunk up to revision 43881.
2012-02-04 14:22:05 +00:00
fc0ce537ba
fix [ #29947 ] Blender crashes when duplicate bones
...
missing NULL check.
2012-02-04 11:59:09 +00:00
075fee4d58
svn merge ^/trunk/blender -r43830:43864
2012-02-03 01:30:21 +00:00
369ae3d28d
internal cleanup, check.
...
* remove duplicate operator, wasnt used.
* added check for duplicate types for CTest.
2012-02-02 04:59:30 +00:00
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
7b2101ace9
svn merge ^/trunk/blender -r43482:43524
2012-01-19 11:31:31 +00:00
879c13bbfc
rename rgb_float_to_byte, rgb_byte_to_float to rgb_float_to_uchar, rgb_uchar_to_float and swap args (math functions mostly have dest arg first like strcpy).
2012-01-19 09:09:00 +00:00
bbe69705a5
svn merge ^/trunk/blender -r43420:43436
2012-01-17 02:20:23 +00:00
e1dd245a1e
more keymap edits
...
- make sure defaults are not assumed (so reuse last settings doesnt
override)
- replace 0/1 for TRUE/FALSE defines.
2012-01-16 16:12:03 +00:00
944dfa23c4
svn merge ^/trunk/blender -r43392:43420
2012-01-16 11:50:17 +00:00
4bce60e25f
went over all keymaps to check for cases where defaults were assumed
...
(which could be wrong if the previous setting was used).
2012-01-16 09:42:29 +00:00
e0df491d1e
Merged changes in the trunk up to revision 43404.
...
Conflicts resolved:
source/blender/python/SConscript
2012-01-15 23:13:12 +00:00
917714acf7
svn merge ^/trunk/blender -r43345:43381
2012-01-15 09:16:39 +00:00
635fba3a66
replace ANIM_OT_time_toggle operator with generic WM_OT_context_toggle operator
2012-01-14 14:17:12 +00:00
a7b0a11811
svn merge ^/trunk/blender -r43278:43294
2012-01-11 15:04:54 +00:00
e10fd04db0
use BLI_strncpy and BLI_snprintf when the size of the string is known.
...
fix for sequencer unique naming which was missed with string length update.
2012-01-11 12:33:51 +00:00
535d27eb49
minor cleanup for string use - no functional changes
...
- use more logical names for strings, noticed too many strings called `str` when reviewing name patch.
- pass __func__ macro to uiBeginBlock(), quite a few names were wrong (copy/paste error).
2012-01-11 09:33:44 +00:00
98bdf0274b
svn merge ^/trunk/blender -r43183:43220
2012-01-08 13:09:09 +00:00
76a211d809
Merged changes in the trunk up to revision 43219.
...
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/pipeline.c
2012-01-08 11:57:53 +00:00
1e23a2ba33
Bugfix [ #29806 ] World nodetrees not included in Animation Editor filtering
...
This was mostly only a problem when using Cycles, where NodeTrees are used to
control the world settings.
Also needed to knock out a few remnants of some bygone attempted optimisation
attempts which were preventing this from working (i.e. if a world block didn't
have any animdata, it's child nodetree would never get seen/tested). These
worked ok in the past, but are not that flexible for extension.
2012-01-06 04:03:31 +00:00
46f2233a93
svn merge ^/trunk/blender -r43085:43092
2012-01-03 07:33:11 +00:00
8983d68fd8
Bugfix [ #29629 ] UV animation stops working forever if Edit mode entered
...
Thanks Sergey for the patch!
This bug, and many like it would arise because at some point a F-Curve would get
detected as being unable to be resolved (when trying to display its name in an
Animation Editor), so gets tagged as being "disabled". It was assumed that such
channels usually belonged to deleted data or stuff that wouldn't be able to be
resolved again for a long time. However, in cases like UV settings, they may
only be unavailable temporarily.
As a compromise, this patch clears this disabled flag if a channel is found to
be now working when (in the process of finding out its name when redrawing an
Animation Editor) it can be resolved, in the same place where the disabling was
taking place. This doesn't work fullproof in tests I've done, but should be
nicer than before.
2012-01-03 02:11:11 +00:00
0896a22723
Merged changes in the trunk up to revision 42902.
...
Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/python/intern/bpy.c
2011-12-27 22:12:46 +00:00
4ced91da47
svn merge ^/trunk/blender -r42778:42839
2011-12-23 08:41:53 +00:00
4d7c44717a
Code cleanup: fix some clang static checker warnings.
2011-12-22 20:29:44 +00:00
4a92ee2831
Merged changes in the trunk up to revision 42692.
2011-12-17 21:24:39 +00:00
e5b1f9c28d
svn merge ^/trunk/blender -r42660:42669
2011-12-16 23:26:29 +00:00
e9ab58ad8f
Fixed incorrect usage of enum as integer
2011-12-16 10:18:59 +00:00
8115753fd2
svn merge ^/trunk/blender -r42564:42586
2011-12-12 21:01:39 +00:00
4b66bd3748
fix for accessing the keying set menu as an enum rather than in int
2011-12-11 17:10:46 +00:00
efc4341ee4
Merged changes in the trunk up to revision 42556.
...
Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c
2011-12-10 20:54:43 +00:00
65f3b93f14
svn merge ^/trunk/blender -r42521:42550
2011-12-10 05:38:00 +00:00
2ba8b81949
remove redundant cases. no functional change.
2011-12-09 01:27:59 +00:00
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
