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
b33f0ef0e3
style cleanup
2012-05-27 19:40:36 +00:00
8925ed1420
Merged changes in the trunk up to revision 46557.
...
Conflicts resolved:
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/makesrna/intern/rna_scene.c
Additional changes:
* Fix for recent changes of BKE_* function renaming.
* Fix for an "attempt to free NULL pointer" in BlenderStrokeRenderer::RenderStrokeRepBasic().
2012-05-11 22:48:41 +00:00
3ef11693f5
Style cleanup: displist module
2012-05-07 06:58:03 +00:00
c93d7a193a
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
c91cee2bb9
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
1dccd4c98a
code cleanup: naming - pose/armature/image
...
also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05 16:03:57 +00:00
a731e13043
code cleanup: function naming, use BKE_*type* prefix.
2012-05-05 14:03:12 +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
343edf2722
style cleanup: function calls & whitespace.
2012-04-29 17:11:40 +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
f88cfd9168
Code and style cleanup in own modules in BKE and also mball module
...
- Make sure functions are named in way BKE_<object>_<action> (same way as RNA callbacks)
- Make functions which are used by mball.c only static and remove their prototypes
from public header file.
Further cleanup is coming.
2012-04-28 16:49:00 +00:00
b340f930ec
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
ceffa6e1fa
code cleanup: comment unused functions (removed one which isnt useful anymore).
2012-04-23 07:32:13 +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
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
69e6894b15
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
4f19c1a995
spelling cleanup
2012-03-18 07:38:51 +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
95670e03a0
style cleanup / comment formatting for bli/bke/bmesh
2012-03-03 20:19:11 +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
9ca7f6659f
Merged changes in the trunk up to revision 44419.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawobject.c
source/creator/CMakeLists.txt
2012-02-25 01:26:45 +00:00
53fece44cf
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +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
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
4a92ee2831
Merged changes in the trunk up to revision 42692.
2011-12-17 21:24:39 +00:00
6ccc605660
Bicubic bump map filtering.
...
This commit introduces bicubic bump map capabilities for the viewport for OpenGL 3.0+ capable GPUs.
To use the functionality change the bump mapping method to "best quality"
Previous "best quality" setting becomes "medium quality" now.
For non OpenGL 3.0 GPUs this becomes the same as "medium quality"
Also:
* added tooltip descriptions to the bump method settings.
* modified the shader to ommit extraneous matrix multiplications for matrices already provided by OpenGL.
Bicubic shader by Morten Mikkelsen. Thanks a lot!
Oh...and FIRST!
2011-12-15 13:58:09 +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
9b2df014d2
fix [ #29459 ] Crash making a linked object group local
...
was an error with make-local refactor & path updating.
2011-11-30 00:32:13 +00:00
65cf6256f5
Fix [ #29410 ] Blender svn 2.60.5 r42177, compositor, glare node bug.
...
The problem was in fact in the changes made to blend_ramp() func at rev42164. The checks on green pointer (if(g) {...) were checking the existance of a valid value (i.e. if input color was rgb or only shades of grey in r pointer), but as we get now a full float[3] pointer, this test is no more possible. And doing if(r_col[1]) {... was wrong, as it only broke things in case green was 0.0 (which was the case with the generated glare color of bug report).
So, just removed all those tests!
2011-11-26 21:42:04 +00:00
b6569ee4e7
Merged changes in the trunk up to revision 42116.
2011-11-26 13:11:55 +00:00
af7288c407
minor edit - weight_to_rgb() and ramp_blend() now take a float vector rather than 3 float pointers.
...
also make particle draw use a float vec.
2011-11-26 03:13:54 +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
bb8fe0bf4a
minor edits
...
- remove unneeded type check from convert grease pencil operator.
- correct some error prints & use __func__.
- make copy_libblock take an ID* argument rather than void*.
2011-11-07 04:36:37 +00:00
e3f03d72b6
added path traversal flag - BPATH_TRAVERSE_SKIP_MULTIFILE,
...
so path manipulation functions dont run multiple times on the same path in the case of sequence strips where the one directory is used as the base for many images.
2011-11-01 06:26:55 +00:00
65668dc5eb
Merged changes in the trunk up to revision 41368.
...
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c
2011-10-30 02:03:40 +00:00
f7d5cea669
use path remapping for all make local functions, patch from Alex Fraser with changes.
2011-10-27 05:34:39 +00:00
a267f9ba4e
edits ontop of Alex's patch from r41292.
...
pass main rather than use G.main when naming from -> to relative paths.
2011-10-26 21:22:35 +00:00
4a04f72069
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
b4e7451cb0
Merged changes in the trunk up to revision 41099.
2011-10-18 23:36:43 +00:00
4750f24663
fix for crash caused by invalid active material index while editing text.
...
also added some better error checking in object_remove_material_slot() so it will print an error rather then crashing if this case ever happens again.
2011-10-11 23:08:17 +00:00
d546002476
Merged changes in the trunk up to revision 40911.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
2011-10-10 21:15:11 +00:00
bc40f11093
header cleanup (no functional changes)
2011-10-10 09:38:02 +00:00
Dalai Felinto
be143cc037
texface fix: if material is not used by mesh set default bge mat flag (backface culling on)
...
report by Mitchell Stokes over IRC, but probably one of the reason people have been asking
to expose the Game Settings material panel in the Render engine as well.
2011-10-06 06:56:45 +00:00
738491555d
BKE material api function: assign_material_id, like assign_material but takes the object data rather then the object.
2011-10-01 17:51:47 +00:00
Dalai Felinto
11a0e00819
BGE Material settings renaming Back Culling to Backface Culling and make it on by default
...
under suggestion of Mitchell Stokes (Moguri)
2011-09-26 06:39:19 +00:00
274b9c8fb8
whitespace cleanup
2011-09-25 12:31:21 +00:00
