This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

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

..

bake.c

code cleanup: also change BKE_blender.h BLENDER_VERSION_CHAR to 'a' so as not to confuse things.

2013-03-05 14:47:49 +00:00

convertblender.c

Work-in-progress re-implementation of CustomData-based edge/face marks.

2013-03-31 10:33:27 +00:00

envmap.c

More UI message i18n fixes and improvements...

2013-03-10 16:55:01 +00:00

external_engine.c

Merged changes in the trunk up to revision 55546.

2013-03-24 12:13:13 +00:00

gammaCorrectionTables.c

style cleanup: trailing tabs & expand some non prefix tabs into spaces.

2012-10-21 05:46:41 +00:00

imagetexture.c

style cleanup

2013-03-31 03:28:46 +00:00

initrender.c

define the size of matrix args for both rows/cols.

2012-12-11 14:29:01 +00:00

multires_bake.c

Fix #34351: Displacement map Bake margin does not work

2013-02-22 09:57:10 +00:00

occlusion.c

More UI message i18n fixes and improvements...

2013-03-10 16:55:01 +00:00

pipeline.c

Merged changes in the trunk up to revision 55700.

2013-04-01 13:47:19 +00:00

pixelblending.c

style cleanup: spaces -> tabs

2013-02-04 00:18:09 +00:00

pixelshading.c

style cleanup: spaces -> tabs

2013-02-04 00:18:09 +00:00

pointdensity.c

More UI message i18n fixes and improvements...

2013-03-10 16:55:01 +00:00

rayshade.c

More UI message i18n fixes and improvements...

2013-03-10 16:55:01 +00:00

render_result.c

Merged changes in the trunk up to revision 55546.

2013-03-24 12:13:13 +00:00

render_texture.c

style cleanup:

2013-03-26 07:29:01 +00:00

rendercore.c

Code cleanup: move render baking code into own file.

2013-01-23 13:13:16 +00:00

renderdatabase.c

style cleanup

2013-03-18 11:44:56 +00:00

shadbuf.c

header cleanup, include BLI before BKE, also use bool for ntreeShaderExecTree

2013-01-24 21:57:13 +00:00

shadeinput.c

header cleanup, include BLI before BKE, also use bool for ntreeShaderExecTree

2013-01-24 21:57:13 +00:00

shadeoutput.c

Merged changes in the trunk up to revision 53280.

2012-12-23 00:23:11 +00:00

sss.c

More UI message i18n fixes and improvements...

2013-03-10 16:55:01 +00:00

strand.c

style cleanup: spaces -> tabs

2013-02-04 00:18:09 +00:00

sunsky.c

code cleanup: spelling,

2012-11-12 07:33:01 +00:00

texture_ocean.c

code cleanup: define sizes of vectors for function args and use C style comments

2012-10-15 09:11:17 +00:00

volume_precache.c

More UI message i18n fixes and improvements...

2013-03-10 16:55:01 +00:00

volumetric.c

style cleanup: trailing tabs & expand some non prefix tabs into spaces.

2012-10-21 05:46:41 +00:00

voxeldata.c

Fix for build error with previous commit, seems the order of #includes matters here.

2013-03-13 17:30:31 +00:00

zbuf.c

style cleanup:

2013-03-26 07:29:01 +00:00