141dd5233e
Merged changes in the trunk up to revision 50257.
...
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
2012-08-29 00:53:29 +00:00
29dd72ea84
code cleanup: some legacy compo nodes were not ifdef'd
2012-08-21 08:58:47 +00:00
3204731209
code cleanup: don't use magic numbers for curve flag & use bool args for curvemapping_changed()
2012-08-21 08:47:36 +00:00
77f47799dd
code cleanup: use BLI_RCT_SIZE macro
2012-08-20 23:06:17 +00:00
d36da8a8a1
style cleanup
2012-08-19 10:41:27 +00:00
22b30da565
Merged changes in the trunk up to revision 49986.
2012-08-18 15:20:35 +00:00
e2cffbe732
rendering now stops the composite job first, then renders.
2012-08-15 10:31:52 +00:00
502dfcce5f
use job types when checking for jobs in areas of the code that made assumptions about job types (that could be wrong)
2012-08-15 10:23:06 +00:00
97859e8709
add wm job types they are not used yet, so this just defines them for new jobs add add argument to search by job type.
2012-08-15 09:42:06 +00:00
44e4c5f831
Merged changes in the trunk up to revision 49797.
2012-08-12 00:09:57 +00:00
f0951f58ca
code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering
2012-08-08 18:37:06 +00:00
4ea2fb8b0a
Merged changes in the trunk up to revision 49478.
...
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c
2012-08-02 00:10:05 +00:00
61469d2e3e
code cleanup: remove unneeded 'struct' qualifiers
2012-07-26 22:47:05 +00:00
3af938918a
fix annoying bug where image open from ID template didn't open in the existing images path.
2012-07-25 09:04:59 +00:00
3b012c041f
Merged changes in the trunk up to revision 49090.
2012-07-20 23:12:05 +00:00
7881d2c1a8
correct own error in logic for skipping mask layers, inverted mask layers with zero alpha still need to be evaluated.
2012-07-16 15:40:47 +00:00
13b56dec78
show alpha in the mask buttons item list
2012-07-16 14:27:45 +00:00
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
84bf3e48c0
style cleanup: use c style comments in C code
2012-07-06 23:56:59 +00:00
b7b5029814
Merged changes in the trunk up to revision 48695.
2012-07-06 23:46:48 +00:00
468ef74ed7
More spell and typo fixes (mostly visualise->visualize, grey->gray, normalise->normalize).
2012-07-03 19:09:07 +00:00
37dc4006c7
First load of spell and typo fixes (mostly UI messages, but also one or two pieces of code using mis-spelled names).
2012-07-03 17:20:21 +00:00
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
358f7d40b6
style cleanup: use TRUE/FALSE for ui align args.
2012-06-19 23:08:16 +00:00
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
ae8103240d
mask editing
...
- clear feather weights (alt+s)
- fix for glitch where placing the feather would jitter.
2012-06-05 09:37:44 +00:00
68a9dd54ec
mask mode for clip editor developed by Sergey Sharybin, Pete Larabell and myself.
...
see:
http://wiki.blender.org/index.php/User:Nazg-gul/MaskEditor
note - mask editing tools need continued development, feather option is not working 100%
2012-06-04 16:42:58 +00:00
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
b33f0ef0e3
style cleanup
2012-05-27 19:40:36 +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
28002edb6b
Finish changes in up/down arrows for menus
...
Restored single triangle for special menus, which still isn't perfect but
probably makes more sense.
Added drawflag bit flags to button, which is currently used to declare, that
button need to have up/down arrows. This is needed because it's tricky to
distinguish if button should have such arrows. For example, ID search buttons
is a simple block button which doesn't directly mean it'll have pop-up menu
and not all buttons which cases pop-up menu to display need to have such
arrows.
So currently only ID selector button is forcing up/down arrows to be displayed,
all the rest buttons now behaves in the same way as it used to be before.
2012-05-23 14:24:40 +00:00
7767239ac7
I18n fixes, mainly for (cycles) nodes (i.e. node template in Buttons window).
...
Note: the problem of sockets translation remains (for all node types), currently they are unavailable from RNA, hence not detected by i18n tools, so only solution is to add N_() in all node sockets templates… yuck! Really have to fix this.
2012-05-22 08:36:06 +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
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
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
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
b56aabf815
style cleanup: multi-line if statements.
2012-04-21 15:11:03 +00:00
4c8febf3ea
Merged changes in the trunk up to revision 45431.
2012-04-06 03:37:27 +00:00
8cddb18da0
- fix error with conflusing key/keyblock in the shape template UI - absolute keyblocks would always be greyed out.
...
- fix mistake setting wrong variable in unlikely case of curve having no bezier or point array set.
2012-04-05 05:25:20 +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
a6ebffe182
style cleanup: interface
2012-03-30 01:51:25 +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
2f348d8b5d
style cleanup: mainly for mesh code, also some WM function use.
2012-03-24 02:51:46 +00:00
4f19c1a995
spelling cleanup
2012-03-18 07:38:51 +00:00
