a42ba82f63
Merged changes in the trunk up to revision 50829.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material). OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.
2012-09-23 18:50:56 +00:00
25c96bc9f3
code cleanup: remove unused macros, commet some which may be useful later - or good to keep for completeness. quieted some warnings and add flags -Wmissing-include-dirs and -Wno-div-by-zero to cmake/gcc
2012-09-20 01:02:39 +00:00
0d5d2146eb
code cleanup: make shape key api names consistent with our new convention.
2012-09-19 10:12:07 +00:00
a9d9bf7909
Code cleanup - Remove/update outdated comments and whitespace tweaks
2012-09-16 11:19:36 +00:00
232571c61a
code cleanup: replace macro for BLI_rect size/center with inline functions.
2012-09-15 11:48:20 +00:00
e75f5c8208
quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.
...
helps for finding unused functions and making functions static, also did some minor code cleanup.
2012-09-15 01:52:28 +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
7a71f58af3
fixes for NULL checks, remove some redundant checks and add some in that have been removed by accident as code has been updated.
2012-09-14 06:17:14 +00:00
4cb6d5d214
code cleanup: reduce calls to CTX_ functions inline, add some docs to mask rasterizer.
2012-09-13 01:50:21 +00:00
a0ae47f06c
add some missing NULL checks, a few parts of the code used a pointer then checked it for NULL after.
...
also made it more clear that some areas assume the pointer isnt null (remove redundant NULL checks).
2012-09-11 02:18:27 +00:00
9559c95aaa
support ANIMFILTER_FOREDIT for mask layers, also move deprecated metaball types to the end of the switch statement when evaluating metaballs.
2012-09-06 00:38:28 +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
141dd5233e
Merged changes in the trunk up to revision 50257.
...
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
2012-08-29 00:53:29 +00:00
5d60dabef4
remove incorrect comment, add in useful one.
2012-08-27 08:23:51 +00:00
ae6907a065
fix [ #32417 ] Grease Pencil color change + DopeSheet 'Summary' = crash
...
summery wasn't checking fcurve types.
2012-08-27 06:55:33 +00:00
ed0489bb6e
style cleanup: also spelling
2012-08-24 23:22:34 +00:00
56b28635e7
code cleanup: rename BLI_in_rctf() --> BLI_rctf_isect_pt(), to conform with our naming convention.
2012-08-23 18:25:45 +00:00
77f47799dd
code cleanup: use BLI_RCT_SIZE macro
2012-08-20 23:06:17 +00:00
26f073b327
macros for rectangle center and size
2012-08-20 15:29:02 +00:00
22b30da565
Merged changes in the trunk up to revision 49986.
2012-08-18 15:20:35 +00:00
7e2f557dba
Typo fix: BKE_sequwnce_get_by_name -> BKE_sequence_get_by_name
2012-08-18 05:49:55 +00:00
016b0d1e3f
Bone color groups now get synced too when syncing bone <-> animdata stuff
...
For now, the notifiers on bone group color setting won't trigger the necessary
color syncing, so it will be necessary to select another bone/object before the
view responds properly.
2012-08-18 05:43:06 +00:00
aa8eda372c
Selecting nodes (and making one active) sets active F-Curve too now
2012-08-18 05:26:40 +00:00
cc1a89faee
Bugfix [ #27652 ] Selecting a bone doesn't update Driver Properties panel
...
More specifically, selecting bones didn't update the active F-Curve/Groups. This
meant that when editing drivers, it was often easy to accidentally edit the
drivers for the wrong bone.
2012-08-18 05:14:21 +00:00
e9caa21830
fix own error in recent smoothview cleanup, also correct some cross references in bmesh docs.
2012-08-17 14:43:20 +00:00
44e4c5f831
Merged changes in the trunk up to revision 49797.
2012-08-12 00:09:57 +00:00
5e0f254afa
utility functions for getting/setting rectangles for operators.
2012-08-08 20:38:55 +00:00
f0951f58ca
code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering
2012-08-08 18:37:06 +00:00
73c191b534
Bugfix [ #32250 ] Dubious selection mode in Dopesheet and Action Editor makes it
...
impossible to delete ungrouped channels
* Active flag wouldn't get cleared off selected Groups and FCurves when clicking
on them again to deselect them
* Disabled property defaults saving for click-handling operator for channels.
While testing the fix for this bug, I noticed that the property-defaults stuff
was leading to selections always defaulting to "extend" once this had been used
once.
2012-08-08 13:55:30 +00:00
1bf893e9c8
Code cleanup: BKE_ prefix for public sequencer functions
2012-08-08 11:15:40 +00:00
887d517e3b
use define for 0.375 = GLA_PIXEL_OFS, used all over the interface.
...
also use M_SQRT1_2 in math_rotation.c
2012-08-05 17:27:52 +00:00
4ea2fb8b0a
Merged changes in the trunk up to revision 49478.
...
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c
2012-08-02 00:10:05 +00:00
4bfef9a443
Display animation data from lamps' node trees in animation editor windows
2012-07-26 16:11:59 +00:00
0df907c4e2
fix for crash when checking for locked action.
2012-07-26 13:40:48 +00:00
7f622c3cdc
Minor style cleanup - remove invalid/unneeded comments
2012-07-23 12:22:09 +00:00
3b012c041f
Merged changes in the trunk up to revision 49090.
2012-07-20 23:12:05 +00:00
684affe549
Code cleanup - missing indention be gone!
...
(And fixed some incorrect comments)
2012-07-20 12:29:56 +00:00
54d2921508
Keyframes from lib-linked actions are now drawn ghosted (just like those of
...
protected/unmodifiable channels),
2012-07-20 12:18:45 +00:00
46bec42333
option to clear all keys from a button, so you dont have to hunt about for the keys inserted.
2012-07-17 15:16:44 +00:00
32cf7fcdb1
code cleanup: spelling
2012-07-16 23:23:33 +00:00
01c3db149c
Fix [ #32086 ] Missing bevel "hold shift" for better accuracy.
...
This commit adds "shift" and numtype to both Bevel and Inset mesh operators.
It also gets rid of the magicnumber used in NumInput to str operation (currently, 20 chars per element, now defined as NUM_STR_REP_LEN in ED_numinput.h).
2012-07-14 14:03:36 +00:00
065605e0da
Merged changes in the trunk up to revision 48893.
...
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/makesrna/RNA_enum_types.h
2012-07-13 23:23:06 +00:00
a5127dba57
vector versions of BLI_in_rctf / BLI_in_rcti, (BLI_in_rctf_v, BLI_in_rcti_v)
...
use where possible.
2012-07-11 18:17:48 +00:00
df107939c9
rename BLI_getQuotedStr --> BLI_str_quoted_substrN to make it more clear its doing an allocation.
2012-07-09 22:16:50 +00:00
84bf3e48c0
style cleanup: use c style comments in C code
2012-07-06 23:56:59 +00:00
b7b5029814
Merged changes in the trunk up to revision 48695.
2012-07-06 23:46:48 +00:00
558721ab59
More spell checking.
2012-07-04 15:04:38 +00:00
d58cb1beaa
Followup for r.48515
...
* Removed material driver creation hack. However, the textures one remains, as
texture eval isn't ready yet
* Shuffled some code
2012-07-03 05:30:19 +00:00
f977da407b
Bugfix [ #31976 ] Bone Group Custom color set is not respected when creating an
...
Action
Custom color set colors were not getting copied over when creating new action
groups. Instead, a "default set" was initialised for use instead.
2012-07-03 01:15:03 +00:00
98a7ca61fa
Merged changes in the trunk up to revision 48505.
2012-07-03 00:02:45 +00:00
