griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
5524ed9ba2d60331abed47c9df0bc2fcf330b36b
test/source/blender/blenkernel
History
Tamito Kajiyama 5524ed9ba2 Merged changes in the trunk up to revision 55700. 
Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h
2013-04-01 13:47:19 +00:00
..
intern
Merged changes in the trunk up to revision 55700.
2013-04-01 13:47:19 +00:00
BKE_action.h
Fix #34040: Moving Normal Node with enabled Cycles Material Preview crashes
2013-02-05 12:46:15 +00:00
BKE_addon.h
user-preferences for addons. currently unused, example & docs still to come.
2012-12-29 10:24:42 +00:00
BKE_anim.h
Merged changes in the trunk up to revision 55546.
2013-03-24 12:13:13 +00:00
BKE_animsys.h
patch [#34103] check_for_dupid.patch
2013-03-10 05:46:24 +00:00
BKE_armature.h
Fix #34040: Moving Normal Node with enabled Cycles Material Preview crashes
2013-02-05 12:46:15 +00:00
BKE_blender.h
Woot woot commit.
2013-03-31 00:38:50 +00:00
BKE_bmesh.h
Enable new bevel tool code in bevel modifier.
2013-02-21 17:29:35 +00:00
BKE_bmfont_types.h
style cleanup / comment formatting for bli/bke/bmesh
2012-03-03 20:19:11 +00:00
BKE_bmfont.h
code cleanup: header cleanup and remove some duplicate defines.
2012-05-12 20:39:39 +00:00
BKE_boids.h
…
BKE_bpath.h
minor edits with recent commits, also avoid calling BKE_mesh_from_object() in vertex paint, just pass the mesh.
2012-12-15 16:31:25 +00:00
BKE_brush.h
Paint system:
2013-03-26 21:34:39 +00:00
BKE_bullet.h
code cleanup: header cleanup and remove some duplicate defines.
2012-05-12 20:39:39 +00:00
BKE_bvhutils.h
code cleanup: header cleanup and remove some duplicate defines.
2012-05-12 20:39:39 +00:00
BKE_camera.h
Merged changes in the trunk up to revision 55546.
2013-03-24 12:13:13 +00:00
BKE_ccg.h
code cleanup: incorrect sized array args, remove some redundant code.
2013-03-17 10:26:23 +00:00
BKE_cdderivedmesh.h
Fix #33752: UV Orco coordinates were wrong for Cycles (and other external
2013-01-10 17:37:17 +00:00
BKE_cloth.h
Bugfix: Cloth did not work with Dynamic Paint.
2012-08-10 00:04:15 +00:00
BKE_collision.h
style cleanup
2012-06-06 22:38:39 +00:00
BKE_colortools.h
patch from Harley Acheson to remove multiple inline defines.
2013-01-12 17:12:48 +00:00
BKE_constraint.h
Code cleanup: add usual 'BKE_' prefix to 'public' constraint functions from blenkernel...
2012-12-23 11:31:15 +00:00
BKE_context.h
improve info view property output for properties.
2012-12-19 02:08:58 +00:00
BKE_curve.h
Merged changes in the trunk up to revision 55546.
2013-03-24 12:13:13 +00:00
BKE_customdata_file.h
code cleanup: header cleanup and remove some duplicate defines.
2012-05-12 20:39:39 +00:00
BKE_customdata.h
Merged changes in the trunk up to revision 55546.
2013-03-24 12:13:13 +00:00
BKE_deform.h
Merged changes in the trunk up to revision 55546.
2013-03-24 12:13:13 +00:00
BKE_depsgraph.h
Fix build error in depsgraph refactoring commit.
2013-02-26 20:34:37 +00:00
BKE_DerivedMesh.h
misc minor edits.
2013-03-29 06:25:22 +00:00
BKE_displist.h
Merged changes in the trunk up to revision 55546.
2013-03-24 12:13:13 +00:00
BKE_dynamicpaint.h
code cleanup: header cleanup and remove some duplicate defines.
2012-05-12 20:39:39 +00:00
BKE_effect.h
style cleanup:
2013-03-26 07:29:01 +00:00
BKE_fcurve.h
use const pointers for file loading and booleans for animation system return values passed as pointers.
2013-03-17 19:13:04 +00:00
BKE_fluidsim.h
define the size of matrix args for both rows/cols.
2012-12-11 14:29:01 +00:00
BKE_font.h
use 'bool' for BLI_/BKE_ functions.
2013-03-09 05:35:49 +00:00
BKE_freestyle.h
A major code update for making the DNA file specification of Freestyle settings
2013-03-23 03:00:37 +00:00
BKE_global.h
New command-line option --debug-freestyle to enable verbose debug messages
2013-01-03 23:27:20 +00:00
BKE_gpencil.h
Merging r50625 through r51896 from trunk into soc-2011-tomato
2012-11-05 19:42:27 +00:00
BKE_group.h
Fix #34040: Moving Normal Node with enabled Cycles Material Preview crashes
2013-02-05 12:46:15 +00:00
BKE_icons.h
Merging r51923 through r52851 from trunk into soc-2011-tomato
2012-12-10 15:18:00 +00:00
BKE_idcode.h
Merged changes in the trunk up to revision 55546.
2013-03-24 12:13:13 +00:00
BKE_idprop.h
Merged changes in the trunk up to revision 55546.
2013-03-24 12:13:13 +00:00
BKE_image.h
Fix #34779: Channels disappear from multilayer exr sequence
2013-03-27 11:26:10 +00:00
BKE_ipo.h
code cleanup: function naming, use BKE_*type* prefix.
2012-05-05 14:03:12 +00:00
BKE_key.h
fix [#33682] Animation not updated when the active shape index isnt set
2013-01-03 06:47:44 +00:00
BKE_lamp.h
Fix #34040: Moving Normal Node with enabled Cycles Material Preview crashes
2013-02-05 12:46:15 +00:00
BKE_lattice.h
Fix #34040: Moving Normal Node with enabled Cycles Material Preview crashes
2013-02-05 12:46:15 +00:00
BKE_library.h
More new data names translation (most cases should be covered now).
2013-03-25 08:29:06 +00:00
BKE_linestyle.h
A major code update for making the DNA file specification of Freestyle settings
2013-03-23 03:00:37 +00:00
BKE_main.h
A major code update for making the DNA file specification of Freestyle settings
2013-03-23 03:00:37 +00:00
BKE_mask.h
Fix #34040: Moving Normal Node with enabled Cycles Material Preview crashes
2013-02-05 12:46:15 +00:00
BKE_material.h
Fix #34040: Moving Normal Node with enabled Cycles Material Preview crashes
2013-02-05 12:46:15 +00:00
BKE_mball.h
use 'bool' for BLI_/BKE_ functions.
2013-03-09 05:35:49 +00:00
BKE_mesh.h
style cleanup:
2013-03-26 07:29:01 +00:00
BKE_modifier.h
remove modifiers_indexInObject(), just call BLI_findindex directly.
2012-12-15 05:46:41 +00:00
BKE_movieclip.h
Merged changes in the trunk up to revision 55546.
2013-03-24 12:13:13 +00:00
BKE_multires.h
Merged changes in the trunk up to revision 55546.
2013-03-24 12:13:13 +00:00
BKE_navmesh_conversion.h
Merging r50625 through r51896 from trunk into soc-2011-tomato
2012-11-05 19:42:27 +00:00
BKE_nla.h
Merged changes in the trunk up to revision 55546.
2013-03-24 12:13:13 +00:00
BKE_node.h
Fix for node groups, now exposing a socket will copy the default value from internal nodes again. Also this value can be changed in the node group Interface panel.
2013-03-28 10:32:04 +00:00
BKE_object_deform.h
Merging r50423 through r50449 from trunk into soc-2011-tomato
2012-09-06 09:44:32 +00:00
BKE_object.h
Merged changes in the trunk up to revision 55546.
2013-03-24 12:13:13 +00:00
BKE_ocean.h
code cleanup: header cleanup and remove some duplicate defines.
2012-05-12 20:39:39 +00:00
BKE_packedFile.h
use 'bool' for BLI_/BKE_ functions.
2013-03-09 05:35:49 +00:00
BKE_paint.h
Texture sampling function refactoring:
2013-03-13 03:46:22 +00:00
BKE_particle.h
style cleanup:
2013-03-26 07:29:01 +00:00
BKE_pbvh.h
style cleanup:
2013-03-26 07:29:01 +00:00
BKE_pointcache.h
rigidbody: Add point cache support
2013-01-23 05:56:34 +00:00
BKE_property.h
replace strcpy with BLI_strncpy or memcpy when the size is known.
2012-12-16 08:43:05 +00:00
BKE_report.h
Fix OS X build error with Quicktime, need <stdio.h> for FILE usage.
2013-02-26 00:49:38 +00:00
BKE_rigidbody.h
rigidbody: Fix inconsistency with world rebuilding
2013-03-03 06:09:45 +00:00
BKE_sca.h
Merging r50625 through r51896 from trunk into soc-2011-tomato
2012-11-05 19:42:27 +00:00
BKE_scene.h
Fix [#34005] blender will close immediately in debug mode on deleting objects
2013-01-26 17:38:45 +00:00
BKE_screen.h
Screen: add exit callback for area and region types, this gets called when
2013-03-15 19:56:29 +00:00
BKE_script.h
Merging r50423 through r50449 from trunk into soc-2011-tomato
2012-09-06 09:44:32 +00:00
BKE_sequencer.h
Merged changes in the trunk up to revision 55546.
2013-03-24 12:13:13 +00:00
BKE_shrinkwrap.h
style cleanup: wrap long lines (>200)
2012-12-23 01:18:35 +00:00
BKE_sketch.h
style cleanup:
2013-03-26 07:29:01 +00:00
BKE_smoke.h
Merging r50625 through r51896 from trunk into soc-2011-tomato
2012-11-05 19:42:27 +00:00
BKE_softbody.h
style cleanup:
2013-03-26 07:29:01 +00:00
BKE_sound.h
Fix #33518: Jack sync doesn't work in 2.64, 2.64 or 2.65 stable versions
2013-03-27 07:19:54 +00:00
BKE_speaker.h
Fix #34040: Moving Normal Node with enabled Cycles Material Preview crashes
2013-02-05 12:46:15 +00:00
BKE_subsurf.h
Merging r50625 through r51896 from trunk into soc-2011-tomato
2012-11-05 19:42:27 +00:00
BKE_suggestions.h
minor updates to text autocomplete api
2012-12-31 14:49:27 +00:00
BKE_tessmesh.h
use booleans for bmesh api.
2013-01-14 16:42:43 +00:00
BKE_text.h
style cleanup: odd indentation
2013-03-14 05:52:30 +00:00
BKE_texture.h
code cleanup
2013-03-18 18:25:05 +00:00
BKE_tracking.h
Multi-threaded frame calculation for movie clip proxies
2013-03-15 11:59:46 +00:00
BKE_unit.h
Fix #34481: camera focal length and sensor size did not use units yet, now they do.
2013-03-13 17:16:49 +00:00
BKE_utildefines.h
Merging r51923 through r52851 from trunk into soc-2011-tomato
2012-12-10 15:18:00 +00:00
BKE_world.h
Fix #34040: Moving Normal Node with enabled Cycles Material Preview crashes
2013-02-05 12:46:15 +00:00
BKE_writeavi.h
Style cleanup: change ffmpeg, avi and frame server api to rna-ish naming style
2012-05-07 09:30:15 +00:00
BKE_writeffmpeg.h
code cleanup: header cleanup and remove some duplicate defines.
2012-05-12 20:39:39 +00:00
BKE_writeframeserver.h
Style cleanup: change ffmpeg, avi and frame server api to rna-ish naming style
2012-05-07 09:30:15 +00:00
CMakeLists.txt
Merging r55547 through r55594 from trunk into soc-2008-mxcurioni
2013-03-26 09:09:31 +00:00
depsgraph_private.h
code cleanup: unused vars in collada, preprocessor formatting & warning in mingw.
2013-03-04 00:53:57 +00:00
nla_private.h
Merged changes in the trunk up to revision 55546.
2013-03-24 12:13:13 +00:00
SConscript
A major code update for making the DNA file specification of Freestyle settings
2013-03-23 03:00:37 +00:00