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
5b88712ff9
move debug flag into its own global var (G.debug), split up debug options.
...
--debug
--debug-ffmpeg
--debug-python
--debug-events
--debug-wm
This makes debug output easier to read - event debug prints would flood output too much before.
For convenience:
--debug-all turns all debug flags on (works as --debug did before).
also removed some redundant whitespace in debug prints and prefix some prints with __func__ to give some context.
2012-03-31 00:59:17 +00:00
6faeac9fe2
style cleanup: add braces around checks - 'if ELEM() {...}', confuses some parsers that done expand macros.
2012-03-25 22:35:18 +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
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
d78accb585
Correction for previous commit to make normals direction always inside
2012-03-20 17:00:25 +00:00
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
4f19c1a995
spelling cleanup
2012-03-18 07:38:51 +00:00
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
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
46045fbb09
style cleanup - braces & else / if's
2012-03-07 04:53:43 +00:00
31d2ee9bf7
style cleanup, brackets in else/if, some indentation.
2012-03-06 18:40:15 +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
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
831f339980
Merged changes in the trunk up to revision 43748.
...
Conflicts resolved:
source/blender/editors/include/UI_resources.h
2012-01-29 12:00:04 +00:00
4966982a5a
svn merge ^/trunk/blender -r43564:43609
2012-01-22 18:04:35 +00:00
cd4123e1db
use inline BLI_math functions for dot product and length calculation.
2012-01-22 17:20:37 +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
705f23064e
svn merge ^/trunk/blender -r43294:43338
2012-01-13 01:39:57 +00:00
e26cd10b7a
Fix #29836 : stress not working as input for displacement texture. Previously it
...
would be computed after displacement, but I don't think this made much sense.
2012-01-11 16:21:17 +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
dab71f9b12
svn merge ^/trunk/blender -r42882:42886
2011-12-27 04:08:21 +00:00
397d7d949f
remove unneeded casts from 'unsigned int' to 'int'
2011-12-27 03:54:23 +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
db6cb30941
svn merge ^/trunk/blender -r42669:42670
2011-12-16 23:50:55 +00:00
3311164b24
Math lib: matrix multiplication order fix for two functions that were
...
inconsistent with similar functions & math notation:
mul_m4_m4m4(R, B, A) => mult_m4_m4m4(R, A, B)
mul_m3_m3m4(R, B, A) => mult_m3_m3m4(R, A, B)
For branch maintainers, it should be relatively simple to fix things manually,
it's also possible run this script after merging to do automatic replacement:
http://www.pasteall.org/27459/python
2011-12-16 19:53:12 +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
22a1ad61f9
svn merge ^/trunk/blender -r42372:42416
2011-12-04 18:39:19 +00:00
9c5ad4fb60
remove old renderer struct member, was only used for setting yafray but was still being checked in a few places,
2011-12-04 16:22:53 +00:00
3fdc28b736
add a new object member to store the dsize, since with my recent commit broke forward compatibility. now the new values are copied into 'dscale' and existing ones remain.
...
this is annoying since now we have dsize and dscale, will look into a way to deprecate struct members next.
2011-12-04 03:35:54 +00:00
9e5b28cd42
svn merge ^/trunk/blender -r42261:42290
2011-11-30 09:31:11 +00:00
6403858ad9
fix [ #29111 ] Wrong application of delta scale
...
apply delta scale as a multiplier & do-versions on existing files.
- bumps subversion to 2.60.6
2011-11-29 21:13:37 +00:00
faa022563d
svn merge ^/trunk/blender -r42245:42261
2011-11-29 18:18:56 +00:00
8c01369935
Fix #29028 : dupli objects missing speed vectors. Check for avoiding creation of
...
speed vectors was checking object instead of object instance layer, which is the
one that is actually used for render layer checks.
2011-11-29 15:46:33 +00:00
93f455dab6
Fix #29411 : displacement texture not working anymore, seems part of delta
...
scale patch got accidentally committed in revision 41485, reverted now.
2011-11-29 12:12:12 +00:00
2676f2d58f
Merged changes in the trunk up to revision 42021.
...
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/pipeline.c
2011-11-20 21:02:12 +00:00
e6e265b2b5
svn merge -r41779:41847 ^/trunk/blender
2011-11-15 02:58:06 +00:00
e59ab6486f
svn merge -r41751:41779 ^/trunk/blender
2011-11-15 02:05:32 +00:00
bb934ad883
Ocean baking was using uninitialized memory, but further investigation it was calculating foam values when they were not used.
...
avoid calculating foam and allocating memory when its not needed.
2011-11-14 05:55:50 +00:00
0ca96e1eb1
Merged changes in the trunk up to revision 41768.
...
Conflicts resolved:
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_enum_types.h
source/blender/render/intern/source/shadeinput.c
source/blenderplayer/bad_level_call_stubs/stubs.c
Additional changes:
* source/blender/makesrna/intern/rna_linestyle.c: Fixed white
space issues that generated a number of compiler errors. The
problem was that two string literals for enumerating MA_RAMP_SOFT
and MA_RAMP_LINEAR contained a space. The string literals are
supposed to represent a valid C identifier because of their use
for automatic code generation.
* Stroke transparency has been temporarily disabled due to a
functionality conflict with some merged changes. A fix of this
issue is planned.
2011-11-12 23:12:30 +00:00
094c9799f9
quiet -Wdouble-promotion warnings
2011-11-11 12:00:08 +00:00
92d35b74e7
svn merge -r41722:41723 ^/trunk/blender
2011-11-11 06:25:45 +00:00
80e398e7b2
Merged changes in the trunk up to revision 41638.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
2011-11-08 06:30:02 +00:00
