Blender Git Commits

Blender Git commits from all branches.

Page: 2146 / 2888

November 11, 2015, 15:15 (GMT)
Merge branch 'master' into id-remap
November 11, 2015, 14:06 (GMT)
Merge branch 'master' into id-remap
November 11, 2015, 11:44 (GMT)
Silence a bit debug prints!
November 11, 2015, 11:43 (GMT)
Merge branch 'master' into id-remap
November 11, 2015, 10:49 (GMT)
Merge branch 'master' into id-remap
November 11, 2015, 09:48 (GMT)
Merge branch 'master' into id-remap

Conflicts:
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/library.c

Also clears now useless 'bool is_user_one' flag from editors' ID remap callback.
November 10, 2015, 19:15 (GMT)
Some minor tweaks.
November 10, 2015, 18:59 (GMT)
Merge branch 'master' into id-remap

Conflicts:
source/blender/blenkernel/intern/object.c
November 10, 2015, 15:56 (GMT)
Hopefully fix the 'real user' nightmare.

Idea is to add two new flags, one saying 'we need to ensure a real user exists',
the other 'we had to increment user count to ensure we have a real user'.

This allows us to easily control the extra user in release/delete/remap cases,
and also fixes the infamous 'add new image to texture, open image in ImageEditor,
delete image from texture, have a zero-user red image in Image Editor' issue.

There is still much to be done here, more places where we can use those flags,
also clear them when we force usercount to zero, etc.

All this allows us to fix unsolvable issues (like Group being ensure_user'ed
in loading code, but only if they do have objects in them), and to avoid returning
ugly bool from editors' callbacks (this is still to be cleaned up in the branch too).

Bad news - this means we cannot use short ID->flag anymore (not enough flags), for now
added a new int ID->flag2 (replacing pad int), not sure how to best manage change here,
maybe for 2.8 we can totally wipe ID->flag? But this would totally break forward compat.
November 10, 2015, 15:21 (GMT)
Merge branch 'master' into id-remap
November 10, 2015, 13:51 (GMT)
Merge branch 'master' into id-remap

Conflicts:
source/blender/blenkernel/intern/library.c
November 10, 2015, 13:47 (GMT)
Minor update/cleanup on usercount, from work done in master.
November 10, 2015, 11:45 (GMT)
Merge branch 'master' into id-remap

Conflicts:
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/linestyle.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/mball.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/world.c
November 10, 2015, 09:59 (GMT)
Removed an unconventional typename use that causes problems with MSVC.
November 10, 2015, 08:54 (GMT)
enabled trigger in dynamic fracture again, fix for cache stopping problem as well
November 9, 2015, 15:16 (GMT)
Refactor: renamed 'Expression' to 'Function'.
November 9, 2015, 12:22 (GMT)
Removed unused deprecated code parts.
November 9, 2015, 09:59 (GMT)
fix for dynamic fracture rotation glitch (was wrong calculation)
November 8, 2015, 23:12 (GMT)
Correction to recent commit, bone face map wasn't written to .blend
November 8, 2015, 22:58 (GMT)
Initial steps for a connected bone and face map selection

Now, when a face map is selected, all bones it is assigned to are selected as well. If this will stay in final design is not sure yet, but the logic added will be needed anyway (likely).
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021