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
28c20e456f
fix for many RNA definitions having soft/hard ranges swapped, make this BLI_assert() on debug builds.
2012-10-11 23:46:12 +00:00
44e4c5f831
Merged changes in the trunk up to revision 49797.
2012-08-12 00:09:57 +00:00
97e9659c53
style cleanup
2012-08-04 12:54:27 +00:00
8a340981be
Added the functionality to make a copy of the active modifier in the Parameter Editor mode.
...
Code contribution by flokkievids. Thank you!
2012-08-02 20:30:23 +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
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
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
a986ece4b3
fix : #31374 Wrong/Missleading hint texts in material assignment. (as clarified with Daniel Salazar & Campbell Barton)
2012-05-09 19:40:54 +00:00
44ee52ab4b
fix : #31374 Wrong/Missleading hint texts in material assignment.
2012-05-09 17:14:16 +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
34b18fcbc1
code cleanup: BKE_ naming, also make bpy.data.images.load() always load a new image. (not use existing one)
2012-05-05 14:52:04 +00:00
299ff91ea1
code cleanup: BKE_scene api naming.
...
also stop numpy from being found in /usr/include with cmake.
2012-05-05 14:33:36 +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
a5af5e8f50
style cleanup: re - http://wiki.blender.org/index.php/Dev:Doc/CodeStyle#Braces_with_Macros
2012-04-30 16:22:40 +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
ef054e165c
style cleanup: format 'for' loop macros the same as for loops, some renaming to BLI_array macros.
2012-04-28 15:14:16 +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
475ecbb0ce
remove BM_ITER, BM_ITER_INDEX macros, use ELEM or MESH variants only (the maceros had unused args in both cases).
2012-04-19 13:47:58 +00:00
75b869e428
style cleanup: BM_ITER / BM_ITER_INDEX / BMO_ITER
2012-04-19 11:44:12 +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
55c210b57e
Fix [ #30709 ] Renaming a bone renames all drivers' targets using a bone of that name, regardless of the armature.
...
This fix adds a "ref_id" ID pointer to BKE_all_animdata_fix_paths_rename() & co, which is the ID against which prefix+oldName/NewName is "applied", currently only used for drivers' bones targets. Just pass NULL to get same behavior as previously. A bit annoying to make such a change for such a specific case, but there seems to be no other way to go... :/
2012-03-30 13:04:29 +00:00
8ec4371ff1
style cleanup: render
2012-03-29 22:42:32 +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
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
4c3bb77012
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +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
622ac0dd16
code cleanup:
...
replace casts: '((Mesh *)ob->data)->edit_btmesh' with 'BMEdit_FromObject(ob)'
also minor style edits.
2012-03-02 12:09:49 +00:00
35708fe150
Merged changes in the trunk up to revision 44561.
...
Conflicts resolved:
source/blender/bmesh/bmesh.h
source/blender/bmesh/bmesh_operators.h
source/blenderplayer/bad_level_call_stubs/stubs.c
2012-02-29 21:35:49 +00:00
47c373c7a9
style cleanup (mostly whitespace)
2012-02-27 10:35:39 +00:00
9f243d531c
Merged changes in the trunk up to revision 44288.
...
Conflicts resolved:
source/blender/blenkernel/intern/cdderivedmesh.c
2012-02-21 02:19: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
a368e6771a
- remove some unused editmesh functions.
...
- copy & rename EditMesh stricts for use with scanfill (remove unused members)
2012-02-19 22:17:30 +00:00
b6dcdb065d
code refactor, function renaming for bmesh.
...
These changes are to make the bmesh api more consistent and easier to learn, grouping similar functions which is convenient for autocomplete.
This uses similar convention to RNA.
* use face/loop/edge/vert as a prefix for functions.
* use 'elem' as a prefix too for functions that can take any type with a BMHeader.
* changed from camel case to underscore separated (like RNA).
2012-02-12 10:51:45 +00:00
8b43813b69
rename BM_ flags for BMHeader->hflag to BM_ELEM_ to be more clear that these flags apply to bmesh elements.
2012-02-12 06:24:12 +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
d3090a32f2
svn merge ^/trunk/blender -r43664:43676
2012-01-24 20:19:09 +00:00
44850d6946
Fix #29946 : Recover Auto Save defaults to "Short List" View -- Cannot determine dates
...
Added option display_type to WM_operator_properties_filesel which defines which file
display type (short/list/icons/default) should be used for file browser.
All current operators are using FILE_DEFAULTDISPLAY display type which means display
type will still be calculated based on type of opening file and user preferences
settings. Recover Auto Save operator is now using long display type so file date can
easily be checked now.
Reviewed by Andrea, thanks!
2012-01-24 18:18:51 +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
f66f33cefc
rename RNA_property_is_set() --> RNA_struct_property_is_set() in preperation to add a second version of the function which takes the property rather then its name.
2012-01-11 16:32:12 +00:00
76a211d809
Merged changes in the trunk up to revision 43219.
...
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/pipeline.c
2012-01-08 11:57:53 +00:00
c0eec8f379
svn merge ^/trunk/blender -r43062:43085
2012-01-03 02:16:52 +00:00
1e18da32fb
replace:
...
CTX_data_pointer_get_type(C, "object", &RNA_Object).data
with api call:
ED_object_context(C)
... since getting the context object is such a common operation.
2012-01-02 17:15:24 +00:00
b6569ee4e7
Merged changes in the trunk up to revision 42116.
2011-11-26 13:11:55 +00:00
0d9d7d3c9d
Fix for functionality inconsistency in the creation of a new line style.
...
Now the '+' button to the right of a line style name (in the template_ID
GUI widget) creates a copy of the active line style instead of a new
line style with default settings.
Also added a proper tool tip for the use of template_ID for line styles.
2011-11-25 01:09:57 +00:00
f9e00b5c99
svn merge ^/trunk/blender -r42009:42053
2011-11-22 11:51:42 +00:00
