Tamito Kajiyama
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
Campbell Barton
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
Campbell Barton
2f348d8b5d
style cleanup: mainly for mesh code, also some WM function use.
2012-03-24 02:51:46 +00:00
Campbell Barton
4c3bb77012
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
Nicholas Bishop
9b5151dbdc
Redraw data properties after selecting a bone.
...
This is so that selecting bones while in weight paint mode will show
the correct active vertex group.
2012-03-19 21:21:23 +00:00
Bastien Montagne
788b47b788
Fix for yesterday i18n own commit (r44924): we now need to define WITH_INTERNATIONAL everywhere TIP_/IFACE_ macros are used (else, we get non-international, dummy NOP macros instead!).
...
Also fixed in main CMakeList file, when no addon dir found, we want to disable WITH_PYTHON (I guess, certainly not WITH_INTERNATIONAL ;) ).
2012-03-17 12:07:58 +00:00
Tamito Kajiyama
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
Campbell Barton
a2c182e923
style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).
2012-03-03 16:31:46 +00:00
Tamito Kajiyama
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
Campbell Barton
684a2c8dca
fix for error in python context.copy(), calling in byttons view would raise an exception.
...
buttons view used incorrect return value. -1 is for valid but not set (could use defines/enum here).
2012-02-27 18:08:31 +00:00
Tamito Kajiyama
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
Tamito Kajiyama
910f04ca63
Merged changes in the trunk up to revision 44221.
...
Conflicts resolved:
release/datafiles/blender_icons.png
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenloader/intern/readfile.c
2012-02-18 11:26:11 +00:00
Campbell Barton
48006292d8
svn merge ^/trunk/blender -r44189:44204
2012-02-17 20:56:25 +00:00
Campbell Barton
2b7ca2304a
unify include guard defines, __$FILENAME__
...
without the underscores these clogged up the namespace for autocompleation which was annoying.
2012-02-17 18:59:41 +00:00
Tamito Kajiyama
ee49241cfc
Fix for a color preview not immediately updated during the manipulation of a color picker.
...
Problem report by Light BWK through personal communications, thanks!
2012-02-16 21:52:05 +00:00
Campbell Barton
075fee4d58
svn merge ^/trunk/blender -r43830:43864
2012-02-03 01:30:21 +00:00
Campbell Barton
dd86ae6e3b
fix [ #28296 ] File selector crash when with filepath property
...
disable browsing a file property within the file selector to avoid a crash.
2012-02-02 05:55:01 +00:00
Campbell Barton
d3090a32f2
svn merge ^/trunk/blender -r43664:43676
2012-01-24 20:19:09 +00:00
Sergey Sharybin
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
Campbell Barton
4966982a5a
svn merge ^/trunk/blender -r43564:43609
2012-01-22 18:04:35 +00:00
Campbell Barton
a98a75346c
quiet warnings and possible NULL checking crash fix for indentation functions.
2012-01-20 23:03:41 +00:00
Campbell Barton
944dfa23c4
svn merge ^/trunk/blender -r43392:43420
2012-01-16 11:50:17 +00:00
Campbell Barton
1a0de15cb5
remove some unused DNA members
2012-01-15 11:53:14 +00:00
Campbell Barton
705f23064e
svn merge ^/trunk/blender -r43294:43338
2012-01-13 01:39:57 +00:00
Campbell Barton
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
Campbell Barton
a7b0a11811
svn merge ^/trunk/blender -r43278:43294
2012-01-11 15:04:54 +00:00
Campbell Barton
535d27eb49
minor cleanup for string use - no functional changes
...
- use more logical names for strings, noticed too many strings called `str` when reviewing name patch.
- pass __func__ macro to uiBeginBlock(), quite a few names were wrong (copy/paste error).
2012-01-11 09:33:44 +00:00
Campbell Barton
b64f352270
svn merge ^/trunk/blender -r43033:43062
2012-01-02 02:57:36 +00:00
Campbell Barton
ec710a2929
remove Id's that crept in
2012-01-02 02:13:31 +00:00
Campbell Barton
c6391e8d23
svn merge ^/trunk/blender -r42053:42069
2011-11-22 15:33:44 +00:00
Brecht Van Lommel
f2136b1d50
Fix a crash switching from cycles to blender internal, wrong order of freeing.
2011-11-22 14:55:53 +00:00
Campbell Barton
9d05ccf9e8
svn merge -r41899:41926 ^/trunk/blender. also sync mempool with trunk and move BLI_mempool_alloc out of mempools header where it was inlined
2011-11-16 19:06:38 +00:00
Brecht Van Lommel
ed5815fc7f
Fix #29243 : unlink texture datablock from material node in texture properties
...
could crash, RNA pointer from context was invalid.
2011-11-16 13:49:51 +00:00
Campbell Barton
92d35b74e7
svn merge -r41722:41723 ^/trunk/blender
2011-11-11 06:25:45 +00:00
Miika Hamalainen
afeb0eeaf0
Dynamic Paint merge:
...
Commit Dynamic Paint from "soc-2011-carrot" branch into trunk.
End-user documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Dynamic_Paint
GSoC wiki page:
http://wiki.blender.org/index.php/User:MiikaH/GSoC-2011-DynamicPaint
2011-11-10 10:24:34 +00:00
Campbell Barton
121ff4223d
svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build
2011-11-10 04:17:43 +00:00
Campbell Barton
77c5160791
quiet warning
2011-11-10 04:03:08 +00:00
Campbell Barton
685041d53a
svn merge -r41650:41655 ^/trunk/blender --- cycles merge, this wont copile, still need to manually update some funcs
2011-11-10 03:05:11 +00:00
Miika Hamalainen
1b4a54ad73
Merge with trunk r41701
2011-11-09 15:46:53 +00:00
Brecht Van Lommel
28ee0f9218
Texturing: texture and 3d view draw type changes, these should only have any
...
effect for a render engine using new shading nodes. In short:
* No longer uses images assigned to faces in the uv layer, rather the active
image texture node is what is edited/painted/drawn.
* Textured draw type now shows the active image texture node, with solid
lighting.
* Material draw mode shows GLSL shader of a simplified material node tree,
using solid lighting.
* Textures for modifiers, brushes, etc, are now available from a dropdown in
the texture tab in the properties editor. These do not use new shading nodes
yet.
http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow
2011-11-08 13:07:16 +00:00
Campbell Barton
cb890a49fb
svn merge ^/trunk/blender -r41602:41638 .
2011-11-08 02:57:28 +00:00
Miika Hamalainen
edec46b0a6
Merge with trunk r41625
2011-11-07 16:36:49 +00:00
Campbell Barton
1d225c6696
use macro for access to library filepath
2011-11-07 15:55:03 +00:00
Miika Hamalainen
46ae692710
Merge with trunk r41342
2011-10-28 17:00:53 +00:00
Campbell Barton
15e6d6cd75
svn merge ^/trunk/blender -r41226:41227 .
2011-10-24 12:43:08 +00:00
Campbell Barton
ad1d3dd30f
svn merge ^/trunk/blender -r41175:41200 --- will need to apply fix after
2011-10-24 07:56:42 +00:00
Campbell Barton
77a7ec7c61
svn merge ^/trunk/blender -r41150:41175
2011-10-24 05:00:53 +00:00
Campbell Barton
4a04f72069
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
Miika Hamalainen
d4541fd891
Merge with trunk r41197
2011-10-22 16:43:23 +00:00
Brecht Van Lommel
e417e011d5
Code cleanup: file operations merged into single header, some function names
...
made less cryptic and changed to indicate if they work on files or directories.
2011-10-22 15:35:49 +00:00
