55015daa43
Merged changes in the trunk up to revision 51448.
...
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesrna/intern/rna_main_api.c
2012-10-20 16:48:48 +00:00
8e01b8959e
style cleanup
2012-10-14 13:08:19 +00:00
e91f33101f
Merged changes in the trunk up to revision 50956.
...
Conflicts resolved:
source/blender/editors/interface/resources.c
2012-09-30 13:16:55 +00:00
aa49ca25d5
incorrect spelling in comments
2012-09-26 20:05:38 +00:00
4172997675
Merged changes in the trunk up to revision 50607.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
2012-09-15 00:15:24 +00:00
1a7eb3454e
style cleanup
2012-09-08 08:59:47 +00:00
aaafa0c2fe
code cleanup: move file string defines into BLI_path_utils.h, BKE_utildefines is now unused but keep incase we want to add defines there later.
2012-09-03 22:04:14 +00:00
56534ecdcb
style cleanup: also add debugging print function for derived mesh DM_debug_print_cdlayers()
2012-09-03 02:41:12 +00:00
22b30da565
Merged changes in the trunk up to revision 49986.
2012-08-18 15:20:35 +00:00
9e742ffc2b
style cleanup: also correct some doxy comments
2012-08-18 13:07:48 +00:00
98a7ca61fa
Merged changes in the trunk up to revision 48505.
2012-07-03 00:02:45 +00:00
c8c743b609
code cleanup: compile with clang and quiet some warnings.
2012-06-28 12:32:06 +00:00
8135cc9f95
Merged changes in the trunk up to revision 47700.
...
Conflicts resolved:
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/windowmanager/WM_types.h
2012-06-10 20:50:43 +00:00
c6cffe98fa
code cleanup: removed/renamed shadow & duplicate variable definitions.
2012-06-09 18:20:40 +00:00
68a9dd54ec
mask mode for clip editor developed by Sergey Sharybin, Pete Larabell and myself.
...
see:
http://wiki.blender.org/index.php/User:Nazg-gul/MaskEditor
note - mask editing tools need continued development, feather option is not working 100%
2012-06-04 16:42:58 +00:00
329b05dcd7
Merged changes in the trunk up to revision 47381.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
2012-06-03 21:11:10 +00:00
45dbb715ee
Revert makesrna part of r47158 because it broke building blenderplayer
...
Apparently not supposed to call ED_* functions from there
Also added a missing "\n" that's been annoying me for a long while
2012-05-29 13:59:31 +00:00
b33f0ef0e3
style cleanup
2012-05-27 19:40:36 +00:00
b6a9a953bc
Merged changes in the trunk up to revision 47056.
...
Conflicts resolved:
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/convertblender.c
2012-05-26 22:22:45 +00:00
57c292daf0
style cleanup
2012-05-25 09:51:53 +00:00
2d2d36fe3b
code cleanup:
...
- style - multi-line ifs move braces onto new lines.
- iterators - convert some to macros, other split up and move brace.
2012-05-20 19:49:27 +00:00
a5152b7ca0
Merged changes in the trunk up to revision 46787.
...
Conflicts resolved:
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/makesrna/intern/rna_main.c
2012-05-19 08:40:56 +00:00
a9f6e54384
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +00:00
bb1f8d9586
Merged changes in the trunk up to revision 46309.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_tools.c
2012-05-05 11:40:42 +00:00
e701f9b670
style cleanup: whitespace / commas
2012-04-29 15:47:02 +00:00
2585d52405
Merged changes in the trunk up to revision 46045.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesdna/DNA_scene_types.h
2012-04-29 00:59:04 +00:00
b340f930ec
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
6701933f5c
style cleanup
2012-04-21 12:51:47 +00:00
cdbfd1db38
Merged changes in the trunk up to revision 45820.
...
Conflicts resolved:
source/creator/creator.c
2012-04-21 00:33:36 +00:00
6fed4fdd5e
Style cleanup (mostly line length, also no final point in tips...).
2012-04-15 13:41:07 +00:00
4a19ccfa5f
Merged changes in the trunk up to revision 45619.
2012-04-14 10:38:11 +00:00
9a6a791ff0
fix [ #30865 ] Crash when browsing last operators in outliner (or by Python API)
...
Operator descriptions can be NULL pointers,
fix this by making use of PROP_NEVER_NULL flag, when its not set, generated string funcs will test for NULL.
2012-04-09 04:39:47 +00:00
79e2cd8fdf
Merged changes in the trunk up to revision 45383.
2012-04-04 00:50:41 +00:00
670cdd5381
code cleanup:
...
always use if (...) even if the macros dont require it (confuses parsers)
define macros without the ';'s included.
2012-04-02 02:41:28 +00:00
4c36a26af5
Merged changes in the trunk up to revision 45308.
...
Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c
2012-03-31 22:09:43 +00:00
f469e0652a
Node socket values now only have soft limits, rather than hard limits, so you
...
can type in any value, and only when sliding the number value there is a limit.
It was already possible to assign any value to a socket with node linking, so
this shouldn't cause any new issues.
Also raised the limits on the math nodes, with a patch by Agustin Benavidez.
2012-03-30 16:09:05 +00:00
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
b8a71efeba
style cleanup: follow style guide for/with/if spacing
2012-03-24 07:52:14 +00:00
5a90ea77bc
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:24:53 +00:00
ed43b652ee
Code style edits (mostly spliting long lines, and removing trailing spaces).
...
Note about long lines: I did not touch to two pieces of code (because I don’t see any way to keep a nicely formated, compact code, with shorter lines):
* The node types definitions into rna_nodetree_types.h
* The vgroup name functions into rna_particle.c
2012-03-18 09:27:36 +00:00
4f19c1a995
spelling cleanup
2012-03-18 07:38:51 +00:00
2caa507b7e
i18n stuff: adds translation_context to RNA structs (used for there ui name), and a first default "Operator" one for all operators' label.
...
The fact is, operators' label are nearly always verbs, while properties labels are nearly always nouns. So this should already solve many translations' problems regarding noun/verb confusion.
This commit also simplifies a bit i18n usage:
*Now IFACE_ and TIP_ macros (or there context versions, CTX_IFACE_/TIP_) are used nearly everywhere (with one exception, where code is a bit complex and needs to manually test whether ui/tip translations is allowed, so no need to redo it later through those macros).
*Also, those macros are now defined to NOP in case WITH_INTERNATIONAL is false, which avoid testing that define everywhere in code!
2012-03-16 15:39:25 +00:00
0873cbaed5
style cleanup: line length - some over 300 long.
2012-03-12 06:07:16 +00:00
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
89a963fb7f
style cleanup: comment blocks
2012-03-09 18:28:30 +00:00
4f7bdc59d3
style cleanup: spelling.
...
also remove large, duplicate comments from sunsky.h
2012-03-09 00:41:09 +00:00
0c05194639
remove printing versions in makesdna/makesrna - this used svn ID property which isnt set in the files anymore.
2012-03-07 18:27:12 +00:00
0114d78c33
Code cleanup in rna files (huge, higly automated with py script).
...
Addresses:
* C++ comments.
* Spaces after if/for/while/switch statements.
* Spaces around assignment operators.
2012-03-05 23:30:41 +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
ea13ec1699
Spelling Cleanup
2012-03-01 12:20:18 +00:00
