Tamito Kajiyama
3b012c041f
Merged changes in the trunk up to revision 49090.
2012-07-20 23:12:05 +00:00
Campbell Barton
250cdd5e52
code cleanup: remove commented includes - mostly from 2.4x
2012-07-18 23:07:07 +00:00
Campbell Barton
32cf7fcdb1
code cleanup: spelling
2012-07-16 23:23:33 +00:00
Campbell Barton
7cc5af4ef3
minor refactor for rect functions. more consistent naming.
2012-07-15 00:29:56 +00:00
Tamito Kajiyama
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
Campbell Barton
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
Campbell Barton
75a5eab8d1
code cleanup
2012-07-08 21:37:59 +00:00
Campbell Barton
4bc818d240
code cleanup: quiet uninitialized memory use warning for X11 - harmless in this case but always gave warnings with memcheck (RGB color for alpha zero icon color wasnt initialized).
...
also some other minor changes.
2012-07-08 12:23:58 +00:00
Campbell Barton
2c8db87897
fix [ #32020 ] Image will not render in second (any scene other than first) if scene name is longer than 28 characters
2012-07-08 00:04:41 +00:00
Campbell Barton
cfb7aee017
style cleanup
2012-07-07 22:51:57 +00:00
Campbell Barton
84bf3e48c0
style cleanup: use c style comments in C code
2012-07-06 23:56:59 +00:00
Tamito Kajiyama
b7b5029814
Merged changes in the trunk up to revision 48695.
2012-07-06 23:46:48 +00:00
Campbell Barton
3a0593cc3d
code cleanup: dont use function calls like dot_v3v3, pow and sqrt within macros which results in calling the function multiple times needlessly.
...
also added some comments.
2012-07-06 22:48:28 +00:00
Campbell Barton
5f792b08e4
fix for rare crash we have with some mango files.
2012-07-06 14:24:41 +00:00
Bastien Montagne
468ef74ed7
More spell and typo fixes (mostly visualise->visualize, grey->gray, normalise->normalize).
2012-07-03 19:09:07 +00:00
Tamito Kajiyama
98a7ca61fa
Merged changes in the trunk up to revision 48505.
2012-07-03 00:02:45 +00:00
Campbell Barton
8b865c01cd
style cleanup: comments
2012-06-30 22:49:33 +00:00
Campbell Barton
c8c743b609
code cleanup: compile with clang and quiet some warnings.
2012-06-28 12:32:06 +00:00
Campbell Barton
32478997ec
style cleanup
2012-06-27 18:29:47 +00:00
Campbell Barton
15cb064e1b
style cleanup
2012-06-25 07:24:48 +00:00
Tamito Kajiyama
1f7ae143a2
Merged changes in the trunk up to revision 48227.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_file/filelist.c
2012-06-24 10:29:26 +00:00
Campbell Barton
74c9c24d27
style cleanyp
2012-06-23 23:22:19 +00:00
Campbell Barton
0b0ac3aa9e
remove scene from new compositor classes. only needs RenderData
2012-06-22 15:06:52 +00:00
Campbell Barton
226c86ae58
use an inline function for rgb -> bw conversion.
2012-06-22 07:49:44 +00:00
Campbell Barton
f5f25b81e8
style cleanup:
...
also fix for building ghost test and fix double free in one of the tests
2012-06-17 09:58:26 +00:00
Campbell Barton
42d0e34fac
style cleanup
2012-06-16 16:57:16 +00:00
Tamito Kajiyama
004e38a44e
Merged changes in the trunk up to revision 47977.
2012-06-15 22:18:25 +00:00
Campbell Barton
5049331755
style cleanup
2012-06-13 17:23:44 +00:00
Brecht Van Lommel
01b036f5c6
Fix #31754 : strand width fade value 2.0 gives wrong result, should fade out
...
strand entirely. Fix based on patch by Philipp Oeser.
2012-06-13 15:33:59 +00:00
Campbell Barton
1dec23d33a
add rgb_to_luma_y(), was being done inline in many places.
2012-06-13 15:05:42 +00:00
Campbell Barton
1a625d1416
code cleanup: use const float's where possible and specify vector size.
2012-06-12 23:19:52 +00:00
Tamito Kajiyama
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
Campbell Barton
105b1031dd
code cleanup: rename sequencer types to SEQ_TYPE_*** and use enums rather then defines.
2012-06-07 15:49:02 +00:00
Campbell Barton
d5032657ed
style cleanup
2012-06-06 22:38:39 +00:00
Campbell Barton
1931aac1f7
style cleanup: (indentation)
2012-06-06 14:48:39 +00:00
Campbell Barton
6cff0b71a7
style cleanup
2012-06-05 21:54:21 +00:00
Sergey Sharybin
617027fdf3
Fix #31352 : Image sequence texture - can't load image after changing image source
...
Added new flag to Imageuser which indicates whether user frame calculation is needed.
This flag is getting set in BKE_image_signal and handled in actual image usage areas
where both image user and current frame is known.
2012-06-04 10:41:18 +00:00
Tamito Kajiyama
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
Thomas Dinges
16117143d8
Massive Code cleanup:
...
* Remove all code for Texture and Sequencer plugin system, this never worked in 2.5x / 2.6x and is therefore not needed anymore.
* DNA structures are kept, all read/writefile code is gone.
2012-05-29 10:21:07 +00:00
Campbell Barton
032d83ecc4
style cleanup: defines with braces
2012-05-27 20:13:59 +00:00
Campbell Barton
2ab62ce126
code cleanup: defines with braces - end with '(void)0' so callers must end with ';' like normal function.
...
... without this some editors dont parse the source so well.
2012-05-27 12:21:13 +00:00
Tamito Kajiyama
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
Campbell Barton
54b64cfd61
code cleanup: use const float and define array size
2012-05-26 22:21:56 +00:00
Campbell Barton
de6af75d4d
code cleanup: use array size and const for vector args
2012-05-26 16:04:31 +00:00
Campbell Barton
da710b3e14
style cleanup: brace placement/newlines
2012-05-24 16:35:45 +00:00
Campbell Barton
dab1d8e487
style cleanup
2012-05-22 22:03:41 +00:00
Campbell Barton
3896ad4cbb
code cleanup: spelling
2012-05-20 21:23:26 +00:00
Campbell Barton
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
Campbell Barton
ed679693c9
style cleanup: whitespace/indentation
2012-05-19 13:55:54 +00:00
Campbell Barton
af3e348430
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +00:00